Merge branch 'master' of https://github.com/anacrolix/torrent

author Gleb Sinyavsky <zhulik.gleb@gmail.com>

Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)

committer Gleb Sinyavsky <zhulik.gleb@gmail.com>

Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)
author Gleb Sinyavsky <zhulik.gleb@gmail.com>
Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)
committer Gleb Sinyavsky <zhulik.gleb@gmail.com>
Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)
diff --cc client.go
Simple merge
diff --cc torrent.go
Simple merge
author	Gleb Sinyavsky <zhulik.gleb@gmail.com>
	Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)
committer	Gleb Sinyavsky <zhulik.gleb@gmail.com>
	Mon, 4 Jan 2016 12:39:08 +0000 (15:39 +0300)
		1	2
client.go	patch \|	diff1 \|	diff2 \|	blob \| history
torrent.go	patch \|	diff1 \|	diff2 \|	blob \| history