aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-11-30 10:21:33 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2017-11-29 21:21:33 -0500
commit66460d8f62b3f27a009bb61be6ce7675c8451b6e (patch)
tree2cb9f222fc95ed2a4a7e3067109de13047bb6032 /CHANGELOG.rst
parent4cc3b909bcf9e1dda67788c29c0c7770d2c67ffe (diff)
downloadcryptography-66460d8f62b3f27a009bb61be6ce7675c8451b6e.tar.gz
cryptography-66460d8f62b3f27a009bb61be6ce7675c8451b6e.tar.bz2
cryptography-66460d8f62b3f27a009bb61be6ce7675c8451b6e.zip
port changelog for 2.1.4 to master (#4031)
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 72d5609f..5a256a25 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,13 @@ Changelog
* Added token rotation support to :doc:`Fernet </fernet>` with
:meth:`~cryptography.fernet.MultiFernet.rotate`.
+.. _v2-1-4:
+
+2.1.4 - 2017-11-29
+~~~~~~~~~~~~~~~~~~
+
+* Added ``X509_up_ref`` for an upcoming ``pyOpenSSL`` release.
+
.. _v2-1-3:
2.1.3 - 2017-11-02