[tor-commits] [gettor/master] Merge refactoring work from Hiro