[tor-commits] [oonib/master] Merge pull request #47 from TheTorProject/fix/refactoring