From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 2 Jun 2015 14:18:24 +0000 (+1000)
Subject: Merge branch 'master' of github.com:anacrolix/torrent
X-Git-Tag: v1.0.0~1163
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=6357294297a45521180b3a36b379f27c45d230cc;p=btrtrc.git

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

6357294297a45521180b3a36b379f27c45d230cc