[tor-commits] [torbrowser/master] Merge branch 'maint-2.2'