summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-08 13:42:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-03-08 13:42:40 (GMT)
commitaf098a221aba15dfd121250e590c8ff72c81665b (patch)
treece609334f1f63e25a45d35afe34783755894f3f0
parentcfb5b87860a6c605c89ec9d409852641ae47f654 (diff)
parentc8358273aec3915c13597c0c5cb5d633589c9da0 (diff)
downloadcpython-af098a221aba15dfd121250e590c8ff72c81665b.zip
cpython-af098a221aba15dfd121250e590c8ff72c81665b.tar.gz
cpython-af098a221aba15dfd121250e590c8ff72c81665b.tar.bz2
merge 3.4 (#23608)
-rw-r--r--Doc/library/ssl.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 7846cad..fe988c0 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -556,7 +556,7 @@ Constants
prefer trusted certificates when building the trust chain to validate a
certificate. This flag is enabled by default.
- .. versionadded:: 3.4.5
+ .. versionadded:: 3.4.4
.. data:: PROTOCOL_SSLv23