[tor-commits] [torspec/master] Merge remote-tracking branch 'asn/bug7317'