diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-07 14:28:17 +0100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-07 14:28:17 +0100 |
| commit | 8956321a007b0a097560679e95054a162d54cca5 (patch) | |
| tree | 8d29b8ce35c1a65d66cb9904662c47f543ccc9f5 | |
| parent | 9ba175847c90a9db8ca09f42631bb699b23a87cb (diff) | |
| parent | df6a5cd1ef3a85c7e7b18ea9c56621b671dec069 (diff) | |
| download | cryptography-8956321a007b0a097560679e95054a162d54cca5.tar.gz cryptography-8956321a007b0a097560679e95054a162d54cca5.tar.bz2 cryptography-8956321a007b0a097560679e95054a162d54cca5.zip | |
Merge pull request #1461 from alex/changelog-license
Refs #1209 -- added a changelog entry for our license change
| -rw-r--r-- | CHANGELOG.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1d69d9cb..a0d8150d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,9 @@ Changelog .. note:: This version is not yet released and is under active development. +* Cryptography has been relicensed from the Apache Software License, Version + 2.0, to being available under *either* the Apache Software License, Version + 2.0, or the BSD license. * Added key-rotation support to :doc:`Fernet </fernet>` with :class:`~cryptography.fernet.MultiFernet`. * More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys |