From 56ea7b85ed1903c8d54e6ba3bbf5654283fd2525 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Fri, 8 Jan 2016 11:53:20 -0800
Subject: port the 1.2.1 changelog to master

---
 CHANGELOG.rst | 6 ++++++
 1 file changed, 6 insertions(+)

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
 ~~~~~~~~~~~~~~~~
 
-- 
cgit v1.2.3