Merge pull request #2487 from reaperhulk/port-changelog
port the 1.1.1 changelog to master
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 91e2aa3..ace0467 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,6 +10,15 @@
:attr:`~cryptography.x509.Certificate.signature` and
:attr:`~cryptography.x509.Certificate.tbs_certificate_bytes` attributes.
+1.1.1 - 2015-11-19
+~~~~~~~~~~~~~~~~~~
+
+* Fixed several small bugs related to compiling the OpenSSL bindings with
+ unusual OpenSSL configurations.
+* Resolved an issue where, depending on the method of installation and
+ which Python interpreter they were using, users on El Capitan (OS X 10.11)
+ may have seen an ``InternalError`` on import.
+
1.1 - 2015-10-28
~~~~~~~~~~~~~~~~