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