Merge branch 'webtorrent'

author Matt Joiner <anacrolix@gmail.com>

Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)

committer Matt Joiner <anacrolix@gmail.com>

Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)
author Matt Joiner <anacrolix@gmail.com>
Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)
committer Matt Joiner <anacrolix@gmail.com>
Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)
diff --cc peerconn.go
Simple merge
diff --cc peerconn_test.go
Simple merge
diff --cc torrent.go
Simple merge
diff --cc tracker_scraper.go
Simple merge
author	Matt Joiner <anacrolix@gmail.com>
	Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)
committer	Matt Joiner <anacrolix@gmail.com>
	Wed, 15 Apr 2020 07:26:46 +0000 (17:26 +1000)
		1	2
peerconn.go	patch \|	diff1 \|	diff2 \|	blob \| history
peerconn_test.go	patch \|	diff1 \|	diff2 \|	blob \| history
torrent.go	patch \|	diff1 \|	diff2 \|	blob \| history
tracker_scraper.go	patch \|	diff1 \|	diff2 \|	blob \| history