Merge pull request #1516 from dibdot/dnscrypt-proxy