aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-01-08 16:40:34 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-01-08 16:40:34 -0500
commitcba511154b1ecc4dbea19a2f2ffbb908c66a3aed (patch)
treef89630850a2bb2ec2e6d22c8e9f4b0a065f45760
parent19b2a38c30bcc035821dd8373f01a742f2ee5f83 (diff)
parent56ea7b85ed1903c8d54e6ba3bbf5654283fd2525 (diff)
downloadcryptography-cba511154b1ecc4dbea19a2f2ffbb908c66a3aed.tar.gz
cryptography-cba511154b1ecc4dbea19a2f2ffbb908c66a3aed.tar.bz2
cryptography-cba511154b1ecc4dbea19a2f2ffbb908c66a3aed.zip
Merge pull request #2657 from reaperhulk/port-1.2.1-changelog
port the 1.2.1 changelog to master
-rw-r--r--CHANGELOG.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d09987ee..7c7c5e53 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,12 @@ Changelog
.. note:: This version is not yet released and is under active development.
+1.2.1 - 2016-01-08
+~~~~~~~~~~~~~~~~~~
+
+* Reverts a change to an OpenSSL ``EVP_PKEY`` object that caused errors with
+ ``pyOpenSSL``.
+
1.2 - 2016-01-08
~~~~~~~~~~~~~~~~