[tor-commits] [torspec/master] Merge commit '8692de910d'