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