[tor-commits] [oonib/master] Merge pull request #6 from stephen-soltesz/master