| commit | 66460d8f62b3f27a009bb61be6ce7675c8451b6e | [log] [tgz] |
|---|---|---|
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | Thu Nov 30 10:21:33 2017 +0800 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Wed Nov 29 21:21:33 2017 -0500 |
| tree | 2cb9f222fc95ed2a4a7e3067109de13047bb6032 | |
| parent | 4cc3b909bcf9e1dda67788c29c0c7770d2c67ffe [diff] |
port changelog for 2.1.4 to master (#4031)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 72d5609..5a256a2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst
@@ -12,6 +12,13 @@ * 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