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