diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-03 16:13:09 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-03 16:13:09 -0800 |
commit | 53f6dbca6e5a5a727c58e6c1fc320e09503d1cba (patch) | |
tree | ea51a47b4d0b69103bbca62d759cc9005ce3d109 /docs/changelog.rst | |
parent | 2b1752ed68a08255ddacf1800c6cb6b406ce5e4b (diff) | |
parent | 59ca2fc4a93ed398e5c2674b7c98a81ed95e0930 (diff) | |
download | cryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.tar.gz cryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.tar.bz2 cryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.zip |
Merge branch 'master' into prioritized-multi-backend
Diffstat (limited to 'docs/changelog.rst')
-rw-r--r-- | docs/changelog.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index f401fe7c..2de9a329 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -15,6 +15,7 @@ Changelog * Fixed compilation on systems where OpenSSL's ``ec.h`` header is not available, such as CentOS. * Added :class:`~cryptography.hazmat.primitives.kdf.pbkdf2.PBKDF2HMAC`. +* Added :class:`~cryptography.hazmat.primitives.kdf.hkdf.HKDF`. 0.1 - 2014-01-08 ~~~~~~~~~~~~~~~~ |