aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-25 11:07:56 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-25 11:07:56 -0500
commitd903ab6163cd2f799139af3baf80dbebb0f05112 (patch)
tree6ada357297e0d2da9ae4e6a6ac2199bf6d2c133f
parent56c740cad469c1b8f0594b92fd825c8f403b257c (diff)
parent65778cfdb25519e8abeadcba8218c3131f4d469e (diff)
downloadcryptography-d903ab6163cd2f799139af3baf80dbebb0f05112.tar.gz
cryptography-d903ab6163cd2f799139af3baf80dbebb0f05112.tar.bz2
cryptography-d903ab6163cd2f799139af3baf80dbebb0f05112.zip
Merge branch 'master' into new-travis
-rw-r--r--docs/security.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/security.rst b/docs/security.rst
index 50253457..13f99960 100644
--- a/docs/security.rst
+++ b/docs/security.rst
@@ -30,9 +30,10 @@ as well as the 2 most recent releases.
New releases for OpenSSL updates
--------------------------------
-As of version 0.5, ``cryptography`` statically links OpenSSL on Windows to ease
-installation. Due to this, ``cryptography`` will release a new version whenever
-OpenSSL has a security or bug fix release to avoid shipping insecure software.
+As of version 0.5, ``cryptography`` statically links OpenSSL on Windows, and as
+of version 1.0.1 on OS X, to ease installation. Due to this, ``cryptography``
+will release a new version whenever OpenSSL has a security or bug fix release to
+avoid shipping insecure software.
Like all our other releases, this will be announced on the mailing list and we
strongly recommend that you upgrade as soon as possible.