Merge branch 'master' into crawshaw

author Matt Joiner <anacrolix@gmail.com>

Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)

committer Matt Joiner <anacrolix@gmail.com>

Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)
author Matt Joiner <anacrolix@gmail.com>
Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)
committer Matt Joiner <anacrolix@gmail.com>
Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)
diff --cc client.go
Simple merge
diff --cc go.mod
Simple merge
diff --cc go.sum
Simple merge
diff --cc torrent.go
Simple merge
author	Matt Joiner <anacrolix@gmail.com>
	Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)
committer	Matt Joiner <anacrolix@gmail.com>
	Fri, 11 Mar 2022 03:23:13 +0000 (14:23 +1100)
		1	2
client.go	patch \|	diff1 \|	diff2 \|	blob \| history
go.mod	patch \|	diff1 \|	diff2 \|	blob \| history
go.sum	patch \|	diff1 \|	diff2 \|	blob \| history
torrent.go	patch \|	diff1 \|	diff2 \|	blob \| history