Merge pull request #1311 from dibdot/dnscrypt-proxy