Issue #5421: merge fix

diff --cc Misc/NEWS
index d8e05fbfcce7605bd9f8e7b7eccd9ecb862e70cf,328e44d01d39eb9cdc983183e13f4a817773eca7..0828cd8df537dd53df167bb2bfcae533c3f7181c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -72,8 -40,9 +72,11 @@@ 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 #10812: Add some extra posix functions to the os module.
 +
  - Issue #10979: unittest stdout buffering now works with class and module
    setup and teardown.
  

diff --cc Modules/socketmodule.c
Simple merge