port 1.1.2 changelog to master
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 06d1954..cb2934c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,15 @@
:class:`~cryptography.x509.CertificateBuilder` and
:class:`~cryptography.x509.CertificateSigningRequestBuilder`.
+1.1.2 - 2015-12-10
+~~~~~~~~~~~~~~~~~~
+
+* Fixed a SIGBUS crash with the OS X wheels caused by redefinition of a
+ method.
+* Fixed a runtime error ``undefined symbol EC_GFp_nistp224_method`` that
+ occurred with some OpenSSL installations.
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2e.
+
1.1.1 - 2015-11-19
~~~~~~~~~~~~~~~~~~
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index dc8bcd0..6def795 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -56,6 +56,7 @@
pseudorandom
pyOpenSSL
relicensed
+runtime
Schneier
scrypt
Serializers