merge 3.4 (#23476)

author Benjamin Peterson <benjamin@python.org>

Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)

committer Benjamin Peterson <benjamin@python.org>

Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)
author Benjamin Peterson <benjamin@python.org>
Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)
committer Benjamin Peterson <benjamin@python.org>
Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_ssl.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Thu, 5 Mar 2015 03:11:48 +0000 (22:11 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_ssl.c	patch \|	diff1 \|	diff2 \|	blob \| history