[tor-commits] [oonib/master] Merge pull request #58 from dstufft/patch-1