New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synchronize change from shadowsocks/overture:shadowsocks #117

Merged
merged 1 commit into from Jan 1, 2019

Conversation

Projects
None yet
2 participants
@qyb
Copy link
Contributor

qyb commented Dec 11, 2018

shawn1m,您好。我正在计划向 shadowsocks-android 中的 DNS 部分加入支持 DNS-over-TLS 服务商的功能——我认为未来 DNS 服务提供商和 socks5 服务提供者是可以分离的,未必一切安全 DNS 解析都要通过 socks5 —— 鉴于 shadowsocks-android 的 DNS 组件是 overture 实现的,所以我为 overture:shadowsocks 分支补充了 DoT 的支持并且已经被合并了( https://github.com/shadowsocks/overture/pulls )。我希望能尽可能保持 overture:shadowsocks 这个分支和 overture 上游一致,所以向您请求合并相关的代码。请 review 一下,看看是否合乎 overture 长期发展的路径

@shawn1m shawn1m merged commit 0919a1f into shawn1m:master Jan 1, 2019

1 of 2 checks passed

codebeat 0 issues resolved and 3 introduced
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@shawn1m

This comment has been minimized.

Copy link
Owner

shawn1m commented Jan 1, 2019

Merged. Thanks a lot!

shawn1m added a commit that referenced this pull request Jan 1, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment