merge 3.5 (closes #25672)

author Benjamin Peterson <benjamin@python.org>

Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)

committer Benjamin Peterson <benjamin@python.org>

Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)
author Benjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)
committer Benjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_ssl.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 8 Jan 2016 05:38:51 +0000 (21:38 -0800)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_ssl.c	patch \|	diff1 \|	diff2 \|	blob \| history