summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-19 22:58:19 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-19 22:58:19 (GMT)
commit869311dd97bff0b22689fcfe1b348bad6b1ab4e6 (patch)
tree354def6c6564f7a7c5d94e1ae3588028da05de83 /Misc
parent3892189db0066f4d2c89f2857a630a5ffac38701 (diff)
parent500af332f407d9a83a0232e4018e10cb49a76a79 (diff)
downloadcpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.zip
cpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.tar.gz
cpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.tar.bz2
merge 3.4 (#23481)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e947f78..189b5f7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@ Core and Builtins
Library
-------
+- Issue #23481: Remove RC4 from the SSL module's default cipher list.
+
- Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty
docstrings.