Issue #26505: merge from 3.5

author Ned Deily <nad@python.org>

Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)

committer Ned Deily <nad@python.org>

Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)
author Ned Deily <nad@python.org>
Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)
committer Ned Deily <nad@python.org>
Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Modules/getaddrinfo.c
Simple merge
author	Ned Deily <nad@python.org>
	Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)
committer	Ned Deily <nad@python.org>
	Mon, 7 Mar 2016 19:52:46 +0000 (14:52 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/getaddrinfo.c	patch \|	diff1 \|	diff2 \|	blob \| history