port the 1.2.1 changelog to master
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d09987e..7c7c5e5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,12 @@
 
 .. 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
 ~~~~~~~~~~~~~~~~