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