Merge pull request #11124 from stangri/18.06-https-dns-proxy
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 26 Jan 2020 20:39:51 +0000 (22:39 +0200)
committerGitHub <noreply@github.com>
Sun, 26 Jan 2020 20:39:51 +0000 (22:39 +0200)
[18.06] https-dns-proxy: fix deleting server items, configurable dnsmasq settings change


Trivial merge