Merge branch 'master' into squirrel

author Matt Joiner <anacrolix@gmail.com>

Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)

committer Matt Joiner <anacrolix@gmail.com>

Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)
author Matt Joiner <anacrolix@gmail.com>
Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)
committer Matt Joiner <anacrolix@gmail.com>
Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)
diff --cc go.mod
Simple merge
diff --cc go.sum
Simple merge
author	Matt Joiner <anacrolix@gmail.com>
	Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)
committer	Matt Joiner <anacrolix@gmail.com>
	Thu, 2 Sep 2021 04:19:29 +0000 (14:19 +1000)
		1	2
go.mod	patch \|	diff1 \|	diff2 \|	blob \| history
go.sum	patch \|	diff1 \|	diff2 \|	blob \| history