Issue #12000: When a SSL certificate has a subjectAltName without any

dNSName entry, ssl.match_hostname() should use the subject's commonName.
Patch by Nicolas Bareil.

diff --cc Lib/ssl.py
Simple merge

diff --cc Lib/test/test_ssl.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index b0d683666f05530bde792ca33607470309d334f7,827e8373cba3e87f2dad0cb3bb65128e8f126ec6..420ed8e78342cfda0fefc7a3678909f40725b66a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,14 -83,10 +140,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12000: When a SSL certificate has a subjectAltName without any
+   dNSName entry, ssl.match_hostname() should use the subject's commonName.
+   Patch by Nicolas Bareil.
+ 
 +- Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and
 +  assertWarnsRegex now accept a keyword argument 'msg' when used as context
 +  managers.  Initial patch by Winston Ewert.
 +
 +- Issue #10684: shutil.move used to delete a folder on case insensitive
 +  filesystems when the source and destination name where the same except
 +  for the case.
 +
  - Issue #11647: objects created using contextlib.contextmanager now support
    more than one call to the function when used as a decorator. Initial patch
    by Ysj Ray.