Skip to content
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

ssl.alpn_port_override (Fixes #171 and #226) #349

Merged
merged 3 commits into from
Mar 22, 2020

Conversation

WillyPillow
Copy link
Contributor

Had some spare time during the weekends and thought I would try to implement the solution I mentioned in #226.

Not sure how to add tests though since http.server in Python does not seem to support h2c :/

@CLAassistant
Copy link

CLAassistant commented Mar 21, 2020

CLA assistant check
All committers have signed the CLA.

@WillyPillow
Copy link
Contributor Author

The CI seems to have trouble installing OpenSSL on Windows for some reason...

@GreaterFire
Copy link
Member

@WillyPillow I'll fix it. Need to update to OpenSSL 1.1.1e

@GreaterFire GreaterFire changed the base branch from master to dev March 22, 2020 19:50
@GreaterFire
Copy link
Member

Thanks!

@GreaterFire GreaterFire merged commit 63c5c43 into trojan-gfw:dev Mar 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants