From 2c6b8d043ea39758493f375f99ec4e07fb3f1e75 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Fri, 29 Jan 2016 13:36:40 -0600
Subject: port 1.2.2 changelog to master

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3d3aeb0e..a203a164 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ Changelog
 * Deprecated support for OpenSSL 0.9.8. Support will be removed in
   ``cryptography`` 1.4.
 
+1.2.2 - 2016-01-29
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2f.
+
 1.2.1 - 2016-01-08
 ~~~~~~~~~~~~~~~~~~
 
-- 
cgit v1.2.3