Merge pull request #12615 from stangri/18.06-https-dns-proxy
authorRosen Penev <rosenp@gmail.com>
Fri, 26 Jun 2020 05:18:08 +0000 (22:18 -0700)
committerGitHub <noreply@github.com>
Fri, 26 Jun 2020 05:18:08 +0000 (22:18 -0700)
commit3361313d33f61db80a3ff62f5d199417e06efe74
tree6c2ec4bf096d4d5953b4e9ee1137f137fa35613d
parentf2b54d8261b5703eb12e5b5959b90c9547264bbd
parent7d36084381f0412060a5add9e8c9b2f139508b13
Merge pull request #12615 from stangri/18.06-https-dns-proxy

[18.06] https-dns-proxy: re-add conffiles and add description to Makefile