summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-11-14 23:14:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-11-14 23:14:42 (GMT)
commitfcc2e71e99edb668cad539dc8fa9f259d0b389b6 (patch)
treeab5c934afb2df480e5a1bb949974ace99a42ab09 /Misc
parent7e2b870b8593233306594237cd5286c60ec7a1e1 (diff)
parent025a1fd9907bb439db9a812c78b8f18dbf4bad9e (diff)
downloadcpython-fcc2e71e99edb668cad539dc8fa9f259d0b389b6.zip
cpython-fcc2e71e99edb668cad539dc8fa9f259d0b389b6.tar.gz
cpython-fcc2e71e99edb668cad539dc8fa9f259d0b389b6.tar.bz2
merge 3.4 (#25578)
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 102f64d..f0ade03 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -245,6 +245,8 @@ Library
- Issue #24881: Fixed setting binary mode in Python implementation of FileIO
on Windows and Cygwin. Patch from Akira Li.
+- Issue #25578: Fix (another) memory leak in SSLSocket.getpeercer().
+
- Issue #25530: Disable the vulnerable SSLv3 protocol by default when creating
ssl.SSLContext.