Merge pull request #311 from hauke/tor
authorTed Hess <thess@kitschensync.net>
Sun, 14 Sep 2014 20:13:50 +0000 (16:13 -0400)
committerTed Hess <thess@kitschensync.net>
Sun, 14 Sep 2014 20:13:50 +0000 (16:13 -0400)
Tor


Trivial merge