Merge pull request #2501 from dibdot/dnscrypt-proxy