[tor-commits] [globe/master] Merge remote-tracking branch 'Syrup-tan/trac-13355'