[tor-commits] [torspec/master] Merge branch 'ticket25095_01_squashed'