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