Merge 3.6

author Victor Stinner <victor.stinner@gmail.com>

Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)

committer Victor Stinner <victor.stinner@gmail.com>

Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)
diff --cc Doc/library/socket.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Mon, 23 Jan 2017 11:34:00 +0000 (12:34 +0100)
		1	2
Doc/library/socket.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history