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