Merge pull request #12614 from stangri/19.07-https-dns-proxy
authorRosen Penev <rosenp@gmail.com>
Fri, 26 Jun 2020 05:18:04 +0000 (22:18 -0700)
committerGitHub <noreply@github.com>
Fri, 26 Jun 2020 05:18:04 +0000 (22:18 -0700)
commit17e12ad7962b80621b7569a99e5fa9947222746f
treec142a5aba88af5029c8de0072d782b982c3e52d5
parent1d369c9e6ace786cd1418dab851949cb9f66b69b
parent4344723f8c900c64949537acca214b85f1e2b28c
Merge pull request #12614 from stangri/19.07-https-dns-proxy

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