aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Trauschke <erik.trauschke@gmail.com>2015-09-25 09:04:10 -0700
committerErik Trauschke <erik.trauschke@gmail.com>2015-09-25 09:04:10 -0700
commit5daefc13780bf55d18b19603784c411ca1783a5a (patch)
treeddc4b08802e36c5a9cf05f72c87802d16e644b10
parentf1e0c30d143f31e4562a7bb9cc5b3d43354da681 (diff)
parent65778cfdb25519e8abeadcba8218c3131f4d469e (diff)
downloadcryptography-5daefc13780bf55d18b19603784c411ca1783a5a.tar.gz
cryptography-5daefc13780bf55d18b19603784c411ca1783a5a.tar.bz2
cryptography-5daefc13780bf55d18b19603784c411ca1783a5a.zip
Merge branch 'master' into crl_ossl_backend
-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.