From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 12 Jan 2017 07:40:23 +0000 (-0800)
Subject: merge heads
X-Git-Tag: v2.7.14rc1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a752eaffd01adefedd31263d34e8294b032193;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

c8a752eaffd01adefedd31263d34e8294b032193
diff --cc Misc/NEWS
index 6a6fb8cc8db9,fd08a7e0b821..ce3853c09f46
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -15,9 -23,15 +23,18 @@@ Extension Module
  Library
  -------
  
 +- Issue #29006: Revert change from issue #10513 for making sqlite more liable to
 +  emit "database table is locked" errors.
 +
+ - Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function
+   but read from /dev/urandom to get random bytes, for example in os.urandom().
+   On Linux, getentropy() is implemented which getrandom() is blocking mode,
+   whereas os.urandom() should not block.
+ 
+ - Issue #29142: In urllib, suffixes in no_proxy environment variable with
+   leading dots could match related hostnames again (e.g. .b.c matches a.b.c).
+   Patch by Milan Oberkirch.
+ 
  - Issue #29094: Offsets in a ZIP file created with extern file object and mode
    "w" now are relative to the start of the file.