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