[tor-commits] [torspec/master] Merge remote-tracking branch 'public/bug19998'