Merge pull request #1309 from dibdot/dnscrypt-proxy