[tor-commits] [oonib/master] Merge pull request #41 from darius/master