Merge pull request #1386 from dibdot/dnscrypt-proxy