[tbb-commits] [tor-browser-build/master] Merge branch 'bug_26238_v6' into master