[tbb-commits] [torbutton/master] Merge remote-tracking branch 'bradetpo/bug32674-01'