Merge socketserver fixes from 3.5 into 3.6

author Martin Panter <vadmium+py@gmail.com>

Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)
author Martin Panter <vadmium+py@gmail.com>
Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)
diff --cc Lib/test/test_ssl.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Thu, 22 Sep 2016 10:33:51 +0000 (10:33 +0000)
		1	2
Lib/test/test_ssl.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history