[tor-commits] [gettor/master] Add some fix and refactoring