[tbb-commits] [torbutton/master] Merge remote-tracking branch 'sysrqb/bug31010_00'