[tbb-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_12680'