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

nit in LICENSE, itself doesn't make sense here #4016

Merged
merged 2 commits into from Nov 10, 2017

Conversation

Projects
None yet
2 participants
@alex
Copy link
Member

commented Nov 9, 2017

No description provided.

LICENSE Outdated
@@ -3,5 +3,5 @@ found in LICENSE.APACHE or LICENSE.BSD. Contributions to cryptography are made
under the terms of *both* these licenses.

The code used in the OpenSSL locking callback and OS random engine is derived
from the same in CPython itself, and is licensed under the terms of the PSF
License Agreement.
from the same in CPython, and is licensed under the terms of the PSF License

This comment has been minimized.

Copy link
@reaperhulk

reaperhulk Nov 9, 2017

Member

How about we just say "derived from CPython". "the same in CPython" still doesn't really make much sense.

@reaperhulk reaperhulk merged commit d2d8000 into master Nov 10, 2017

2 checks passed

continuous-integration/jenkins/pr-merge This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@reaperhulk reaperhulk deleted the alex-patch-1 branch Nov 10, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.