Merge pull request #11659 from ja-pa/tor-hs-new