Merge pull request #12613 from stangri/master-https-dns-proxy
authorRosen Penev <rosenp@gmail.com>
Fri, 26 Jun 2020 05:17:59 +0000 (22:17 -0700)
committerGitHub <noreply@github.com>
Fri, 26 Jun 2020 05:17:59 +0000 (22:17 -0700)
https-dns-proxy: re-add conffiles and add description to Makefile


Trivial merge