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)
[18.06] https-dns-proxy: re-add conffiles and add description to Makefile


Trivial merge