merge

diff --cc Misc/NEWS
index 720eab341a3499d0e04b661fbc3ef21403a05194,36860b1efb6af97b233a39b40ffaeee55d436ca6..b423b8b738c305845eb37834d2b9722395907aa5
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -66,12 -66,10 +66,16 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
 +  inside subjectAltName correctly. Formerly the module has used OpenSSL's
 +  GENERAL_NAME_print() function to get the string represention of ASN.1
 +  strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and
 +  ``uniformResourceIdentifier`` (URI).
 +
+ - Issue #18756: Improve error reporting in os.urandom() when the failure
+   is due to something else than /dev/urandom not existing (for example,
+   exhausting the file descriptor limit).
+ 
  - Issue #18405: Improve the entropy of crypt.mksalt().
  
  - Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get