Merge patches into v1.25

author Matt Joiner <anacrolix@gmail.com>

Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)

committer Matt Joiner <anacrolix@gmail.com>

Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)
author Matt Joiner <anacrolix@gmail.com>
Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)
committer Matt Joiner <anacrolix@gmail.com>
Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)
diff --cc client_test.go
Simple merge
diff --cc torrent.go
Simple merge
author	Matt Joiner <anacrolix@gmail.com>
	Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)
committer	Matt Joiner <anacrolix@gmail.com>
	Thu, 11 Mar 2021 23:06:13 +0000 (10:06 +1100)
		1	2
client_test.go	patch \|	diff1 \|	diff2 \|	blob \| history
torrent.go	patch \|	diff1 \|	diff2 \|	blob \| history