Merge branch 'http-proxying'

author Matt Joiner <anacrolix@gmail.com>

Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)

committer Matt Joiner <anacrolix@gmail.com>

Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)
author Matt Joiner <anacrolix@gmail.com>
Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)
committer Matt Joiner <anacrolix@gmail.com>
Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)
diff --cc client.go
Simple merge
diff --cc torrent.go
Simple merge
author	Matt Joiner <anacrolix@gmail.com>
	Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)
committer	Matt Joiner <anacrolix@gmail.com>
	Tue, 15 Mar 2022 01:41:22 +0000 (12:41 +1100)
		1	2
client.go	patch \|	diff1 \|	diff2 \|	blob \| history
torrent.go	patch \|	diff1 \|	diff2 \|	blob \| history