Merge pull request #2666 from aarond10/https_dns_proxy