Merge 3.5: Issue #26227

diff --cc Misc/NEWS
index 6e1a5a0d91b6dbb1a8f9ba8565c5af232c44fe65,d6f81db4b847c6406a12ef5d25c9e0bb60fe473a..b4ed741aa4f08cda5e1fbd671a5a56c718ece5ad
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -159,10 -66,10 +159,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #26227: On Windows, getnameinfo(), gethostbyaddr() and
+   gethostbyname_ex() functions of the socket module now decode the hostname
+   from the ANSI code page rather than UTF-8.
+ 
 +- Issue #26099: The site module now writes an error into stderr if
 +  sitecustomize module can be imported but executing the module raise an
 +  ImportError. Same change for usercustomize.
 +
  - Issue #26147: xmlrpc now works with strings not encodable with used
    non-UTF-8 encoding.
  

diff --cc Modules/socketmodule.c
Simple merge