Merge pull request #2545 from bdarnell/future-exception-cancel

author Ben Darnell <ben@bendarnell.com>

Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)

committer GitHub <noreply@github.com>

Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)
author Ben Darnell <ben@bendarnell.com>
Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)
committer GitHub <noreply@github.com>
Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)
diff --cc tornado/httpclient.py
Simple merge
diff --cc tornado/test/httpclient_test.py
Simple merge
author	Ben Darnell <ben@bendarnell.com>
	Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)
committer	GitHub <noreply@github.com>
	Mon, 3 Dec 2018 00:44:04 +0000 (19:44 -0500)
		1	2
tornado/httpclient.py	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/test/httpclient_test.py	patch \|	diff1 \|	diff2 \|	blob \| history