Merge pull request #1319 from dibdot/dnscrypt-proxy