Merge pull request #4165 from cpu/feature_dnscrypt_proxy_custom_resolver
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 20 Mar 2017 14:40:07 +0000 (16:40 +0200)
committerGitHub <noreply@github.com>
Mon, 20 Mar 2017 14:40:07 +0000 (16:40 +0200)
dnscrypt-proxy: Add custom resolver config support


Trivial merge