Issue #29142: Merge 3.6.

author Xiang Zhang <angwerzx@126.com>

Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)

committer Xiang Zhang <angwerzx@126.com>

Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)
author Xiang Zhang <angwerzx@126.com>
Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)
committer Xiang Zhang <angwerzx@126.com>
Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)
diff --cc Lib/urllib/request.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Xiang Zhang <angwerzx@126.com>
	Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)
committer	Xiang Zhang <angwerzx@126.com>
	Mon, 9 Jan 2017 03:52:10 +0000 (11:52 +0800)
		1	2
Lib/urllib/request.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history