[tor-commits] [globe/master] Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master