From: Christian Heimes <christian@cheimes.de>
Date: Sat, 23 Nov 2013 14:59:07 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.4.0b1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5de397e158d538ffa065974006e58547891bd955;p=python

merge
---

5de397e158d538ffa065974006e58547891bd955
diff --cc Misc/NEWS
index b7b9b3b1dd,3cfe2347a6..2b804e8cab
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -68,9 -68,12 +68,15 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #19689: Add ssl.create_default_context() factory function. It creates
 +  a new SSLContext object with secure default settings.
 +
+ - Issue #19727: os.utime(..., None) is now potentially more precise
+   under Windows.
+ 
+ - Issue #17201: ZIP64 extensions now are enabled by default.  Patch by
+   William Mallard.
+ 
  - Issue #19292: Add SSLContext.load_default_certs() to load default root CA
    certificates from default stores or system stores. By default the method
    loads CA certs for authentication of server certs.