[tbb-commits] [tor-browser-bundle/master] Merge ln5's branch 'tools2'