summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-10-03 21:33:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-10-03 21:33:45 (GMT)
commit8b9cfa10662c7712f7685f4bc376ab65c119589b (patch)
treee6e9fe1135a593580ad080c50b23ab8327e56fe7 /Misc
parentdf75fee9a35c2ac33e94744216e0a49e8aa0bae4 (diff)
parent5915b0f924152b4801c1fe49aff348fd1981cc05 (diff)
downloadcpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.zip
cpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.tar.gz
cpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.tar.bz2
merge 3.4 (#22449)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f66a51e..65d6b21 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -159,6 +159,9 @@ Core and Builtins
Library
-------
+- Issue #22449: In the ssl.SSLContext.load_default_certs, consult the
+ enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
+
- Issue #22508: The email.__version__ variable has been removed; the email
code is no longer shipped separately from the stdlib, and __version__
hasn't been updated in several releases.