Merge pull request #241 from encode/protocol-support

author Tom Christie <tom@tomchristie.com>

Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)
author Tom Christie <tom@tomchristie.com>
Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)
diff --cc httpx/__init__.py
Simple merge
diff --cc httpx/client.py
Simple merge
diff --cc httpx/dispatch/connection.py
Simple merge
author	Tom Christie <tom@tomchristie.com>
	Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Aug 2019 14:16:28 +0000 (15:16 +0100)
		1	2
httpx/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
httpx/client.py	patch \|	diff1 \|	diff2 \|	blob \| history
httpx/dispatch/connection.py	patch \|	diff1 \|	diff2 \|	blob \| history