merge 3.4

This commit is contained in:
Benjamin Peterson 2014-12-06 11:37:18 -05:00
commit b9859daeeb

View file

@ -554,8 +554,8 @@ Constants
Selects SSL version 2 as the channel encryption protocol.
This protocol is not available if OpenSSL is compiled with OPENSSL_NO_SSL2
flag.
This protocol is not available if OpenSSL is compiled with the
``OPENSSL_NO_SSL2`` flag.
.. warning::
@ -565,6 +565,9 @@ Constants
Selects SSL version 3 as the channel encryption protocol.
This protocol is not be available if OpenSSL is compiled with the
``OPENSSL_NO_SSLv3`` flag.
.. warning::
SSL version 3 is insecure. Its use is highly discouraged.