[tor-commits] [globe/master] Merge pull request #2 from Syrup-tan/trac-13355