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