[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/bug25903_v3'