[tor-commits] [torspec/master] Apply Zhenfei et. al's changes to prop#263.