Merge pull request #12613 from stangri/master-https-dns-proxy
authorRosen Penev <redacted>
Fri, 26 Jun 2020 05:17:59 +0000 (22:17 -0700)
committerGitHub <redacted>
Fri, 26 Jun 2020 05:17:59 +0000 (22:17 -0700)
commitc7dca50f110d5458ceff21a2274eddae2aae119b
tree3943e25f13af1d81598bfeabba5008c04b71e13f
parentb867631f7cde40cc2cdd65343936e931a315bd7a
parentd2f4454fe61caccefecc28f8add8f6d4219b5bb5
Merge pull request #12613 from stangri/master-https-dns-proxy

https-dns-proxy: re-add conffiles and add description to Makefile
git clone https://git.99rst.org/PROJECT