Merge pull request #4400 from starcms/master
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 31 May 2017 15:57:40 +0000 (18:57 +0300)
committerGitHub <noreply@github.com>
Wed, 31 May 2017 15:57:40 +0000 (18:57 +0300)
commitd1936da4141ae12ea221799fcdbc6904a57d24a2
treee96dd9273e53c199a9343ff9bd91f9c36336d7cd
parent88e86b06af01173426a64fef4ccffa47411317a2
parenta032c44a501cb860cb7f5fb6bc55fdb6fa2de1ed
Merge pull request #4400 from starcms/master

net/dnscrypt-proxy: add support for LogLevel; update dnscrypt-proxy-resolvers