Merge pull request #11616 from stangri/18.06-https-dns-proxy
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 21 Mar 2020 07:47:15 +0000 (09:47 +0200)
committerGitHub <noreply@github.com>
Sat, 21 Mar 2020 07:47:15 +0000 (09:47 +0200)
commit9bdb25f51f67d2075818cada488864558b3c2a39
tree739bb996d9ff0947b1ee55739d68264862718d76
parentf5ae75cf0be96c99223a925d0f9d07aaa80751d6
parent6b290744dba7b24eb2ce053e7da37249df3edf69
Merge pull request #11616 from stangri/18.06-https-dns-proxy

[18.06] https-dns-proxy: support for dnsmasq noresolv option