summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 10:58:43 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 10:58:43 -0400
commitb0876fa01394186d08938430f9459012fdde3bf1 (patch)
tree2eb38cbd35029e18051e8853a73ff5c1b2deacae /sites/www/changelog.rst
parentfded67e7120d79c619e541ccd3ba19898c194b5b (diff)
parentfa86d655dc8f08eb9171930c41b508e2bee08b08 (diff)
Merge branch 'master' into ecdsa-deterministic
Conflicts: paramiko/ecdsakey.py
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 4563877d..5f019bb8 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :support:`295` Swap out a bunch of PyCrypto hash functions with use of
+ `hashlib`. Thanks to Alex Gaynor.
* :support:`290` (also :issue:`292`) Add support for building universal
(Python 2+3 compatible) wheel files during the release process. Courtesy of
Alex Gaynor.