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)
commit058c9b84a8f6d9fe163012dd02f5dca198bf27c5
tree657009f8d5401d15c1f630af4ce44b94c1a74b70
parentef3b3f61c2517ac0797cd26288a87bf7d70dd541
parent5b03da037ab0c4e4bdc4ac4ee19415c2c951791c
Merge pull request #11209 from G-M0N3Y-2503/feature_https-dns-proxy

https-dns-proxy: Reapply overwritten commit / merge