[tor-commits] [torbutton/master] Merge remote-tracking branch 'bradetpo/bug19251-03'