Issue #5421: merge fix

diff --cc Misc/NEWS
index 432441a8a5b64109003a3352de215a29d65af45a,f18e557fd00627e042999eccd9399991afc3ceea..328e44d01d39eb9cdc983183e13f4a817773eca7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -40,15 -40,9 +40,17 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #5421: Fix misleading error message when one of socket.sendto()'s
+   arguments has the wrong type.  Patch by Nikita Vetoshkin.
  
 +- Issue #10979: unittest stdout buffering now works with class and module
 +  setup and teardown.
 +
 +- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage
 +
 +- Issue #11243: fix the parameter querying methods of Message to work if
 +  the headers contain un-encoded non-ASCII data.
 +
  - Issue #11401: fix handling of headers with no value; this fixes a regression
    relative to Python2 and the result is now the same as it was in Python2.
  

diff --cc Modules/socketmodule.c
Simple merge