Merge pull request #22483 from rsalvaterra/tor-bump