[tor-commits] [torspec/master] Merge branch 'feature-17178-squashed'