Merge pull request #23943 from rsalvaterra/tor-bump