merge_from_torbrowser-launcher_upstream Jenkins job is not testing what it should

The ISO build failures we see are about conflicts between our own patch and what’s in Debian testing. We’re testing merging upstream into our own branch.

Once this is fixed, we should revert commit 39158ca in our jenkins-jobs repo.

Related issues

Related to #8854 (closed)
Related to #11078 (closed)

Original created by @intrigeri on 10582 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information