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