Merge pull request #2666 from aarond10/https_dns_proxy
authorYousong Zhou <yszhou4tech@gmail.com>
Tue, 21 Jun 2016 10:19:05 +0000 (18:19 +0800)
committerGitHub <noreply@github.com>
Tue, 21 Jun 2016 10:19:05 +0000 (18:19 +0800)
Https dns proxy


Trivial merge