From d3b9af67aeaee5039f2acc5ffdd35a508bcf94cf Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Tue, 24 Oct 2017 12:23:16 -0400
Subject: Forward port 2.1.2 changelog (#3998)

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

(limited to 'CHANGELOG.rst')

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9e1d0ebd..19bd3ec5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,14 @@ Changelog
 * Added token rotation support to :doc:`Fernet </fernet>` with
   :meth:`~cryptography.fernet.MultiFernet.rotate`.
 
+.. _v2-1-2:
+
+2.1.2 - 2017-10-24
+~~~~~~~~~~~~~~~~~~
+
+* Corrected a bug with the ``manylinux1`` wheels where OpenSSL's stack was
+  marked executable.
+
 .. _v2-1-1:
 
 2.1.1 - 2017-10-12
-- 
cgit v1.2.3