Merge pull request #11209 from G-M0N3Y-2503/feature_https-dns-proxy
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 14 Mar 2020 06:28:17 +0000 (08:28 +0200)
committerGitHub <noreply@github.com>
Sat, 14 Mar 2020 06:28:17 +0000 (08:28 +0200)
https-dns-proxy: Reapply overwritten commit / merge


Trivial merge