[tor-commits] [torbrowser/maint-2.2] Merge branches 'ff6-minimal' and 'maint-2.2' into maint-2.2