Merge pull request #3961 from stangri/18.06-luci-app-https-dns-proxy