merge 3.4 (#23481)

author Benjamin Peterson <benjamin@python.org>

Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)

committer Benjamin Peterson <benjamin@python.org>

Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)
author Benjamin Peterson <benjamin@python.org>
Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)
committer Benjamin Peterson <benjamin@python.org>
Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)
diff --cc Lib/ssl.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)
		1	2
Lib/ssl.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history