From 01f0c67f516b3ca202fb34e0f7d284a8a45f6cc5 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 20 Aug 2014 20:15:18 -1000
Subject: port 0.5.4 changelog to master

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

(limited to 'CHANGELOG.rst')

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f42a9211..396b5c2d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,13 @@ Changelog
   constructor. The ``salt_length`` should be passed to
   :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS` instead.
 
+0.5.4 - 2014-08-20
+~~~~~~~~~~~~~~~~~~
+
+* Added several functions to the OpenSSL bindings to support new
+  functionality in pyOpenSSL.
+* Fixed a redefined constant causing compilation failure with Solaris 11.2.
+
 0.5.3 - 2014-08-06
 ~~~~~~~~~~~~~~~~~~
 
-- 
cgit v1.2.3