[tor-commits] [torspec] 06/14: Merge branch 'hs-htype' into 'main'