[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/bug26799'