Merge pull request #1382 from dibdot/dnscrypt-proxy