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