diff options
| author | Adam Goodman <akgood@duosecurity.com> | 2014-07-23 15:11:46 -0400 |
|---|---|---|
| committer | Adam Goodman <akgood@duosecurity.com> | 2014-07-23 15:11:46 -0400 |
| commit | e97ae127f9fc44098f2461a567aa6b9a61e37f5c (patch) | |
| tree | 671df50035c3daadb26ddb081e36493c610828e5 /docs/installation.rst | |
| parent | ab3093ffe7dcc058cbd1b22ecb32b715ca47d6d2 (diff) | |
| parent | ad116e26d102651ab6dc2752ae21afb92b72ad6f (diff) | |
| download | cryptography-e97ae127f9fc44098f2461a567aa6b9a61e37f5c.tar.gz cryptography-e97ae127f9fc44098f2461a567aa6b9a61e37f5c.tar.bz2 cryptography-e97ae127f9fc44098f2461a567aa6b9a61e37f5c.zip | |
Merge branch 'master' into reorder_libs
Diffstat (limited to 'docs/installation.rst')
| -rw-r--r-- | docs/installation.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation.rst b/docs/installation.rst index 339d8b76..6b8bb219 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -13,7 +13,7 @@ Supported platforms Currently we test ``cryptography`` on Python 2.6, 2.7, 3.2, 3.3, 3.4 and PyPy on these operating systems. -* x86-64 CentOS 6.4 and CentOS 5.x +* x86-64 CentOS 7.x, 6.4 and CentOS 5.x * x86-64 FreeBSD 9.2 and FreeBSD 10 * OS X 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion * x86-64 Ubuntu 12.04 LTS @@ -29,7 +29,7 @@ OpenSSL releases: * ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``) * ``OpenSSL 1.0.1`` * ``OpenSSL 1.0.1e-freebsd`` -* ``OpenSSL 1.0.1g`` +* ``OpenSSL 1.0.1h`` * ``OpenSSL 1.0.2 beta`` On Windows |