[tbb-commits] [torbutton/master] Merge remote-tracking branch 'richardtpo/bug_33707'