[tor-commits] [torbrowser/master] Merge branches 'firefox-6.0.1' and 'maint-2.2' into maint-2.2