tor-browser-build merge requestshttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests2023-02-15T18:25:09Zhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/649Bug 40764: Embed repo URL and git revision in Firefox2023-02-15T18:25:09ZPier Angelo VendrameBug 40764: Embed repo URL and git revision in Firefox## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser#41603
- tor-browser-build#40764
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major b...## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser#41603
- tor-browser-build#40764
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [x] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
This commit sets `MOZ_SOURCE_REPO` and `MOZ_SOURCE_CHANGESET` in `projects/firefox/mozconfig`.
They are used to build a source URL that is user-visible in `about:buildconfig` (and `buildinfo.ini`).
However, we need also tor-browser!536, or the URL Firefox generates won't be valid for GitLab.Pier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/648Bug 40760: Add BSD packager contacts to release prep templates2023-02-02T14:28:12ZrichardBug 40760: Add BSD packager contacts to release prep templates## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40760
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40760
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->
Added a FreeBSD packager ( https://portscout.freebsd.org/freebsd@sysctl.cz.html ) contact, still waiting on another that popped up in `#tor-dev` and then we'll be good here.richardrichardhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/647Draft: Bug 40757: Use single .nsi template for all browsers2023-02-10T08:45:28ZboklmDraft: Bug 40757: Use single .nsi template for all browsers## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40757
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-d...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40757
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/646Bug 28124 (backport): Use a custom volume icon also on Tor Browser 12.02023-02-01T13:11:13ZPier Angelo VendrameBug 28124 (backport): Use a custom volume icon also on Tor Browser 12.0## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser-build#28124
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org...## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser-build#28124
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
Backporting #28124.
Creating a MR for the backport because we did a lot of modifications in tor-browser-build, so this backport could use a review.Pier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/645signing scripts updates2023-01-31T15:52:45Zboklmsigning scripts updates## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- closes #40736
- closes #40755
- closes #40756
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or oth...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- closes #40736
- closes #40755
- closes #40756
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/644Bug 40731: Update torbutton directory to apply namecoin-torbutton.patch2023-01-23T17:20:48ZboklmBug 40731: Update torbutton directory to apply namecoin-torbutton.patch## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40731.
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40731.
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/643Bug 40752: Fix urls in download-android-*.json files2023-01-24T12:05:29ZboklmBug 40752: Fix urls in download-android-*.json files## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40752.
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40752.
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/642Bug 40751: Fix make signtag-* after #407372023-01-26T16:15:52ZboklmBug 40751: Fix make signtag-* after #40737## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40751
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-d...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40751
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/641Bug 40723: Use tor-browser-update-responses.git in upload-update_responses-to...2023-01-23T16:35:09ZboklmBug 40723: Use tor-browser-update-responses.git in upload-update_responses-to-staticiforme## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40723
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-d...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40723
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/640Bug 40747+40748: empty line at the top of sha256sums-unsigned-build.txt2023-01-23T16:47:43ZboklmBug 40747+40748: empty line at the top of sha256sums-unsigned-build.txt## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40747
- Closes #40748
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40747
- Closes #40748
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/639Bug 40712: 12.0.2-build22023-01-18T19:05:19ZboklmBug 40712: 12.0.2-build2## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40712
## Change Description
build2 for 12.0.2
<!-- Whatever context the reviewer needs to effectively review the patch...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40712
## Change Description
build2 for 12.0.2
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/638Bug 40746: Remove pt_config.json from pt dir on macos2023-01-18T18:50:03ZboklmBug 40746: Remove pt_config.json from pt dir on macos## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
Closes #40746
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day ...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
Closes #40746
- ### Backport Timeline
- [x] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/637Apply Snowflake Remove HelloVerify Countermeasure2023-04-05T14:50:32ZshelikhooApply Snowflake Remove HelloVerify Countermeasure## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- [Apply Skip Hello Verify Migration](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/131)
...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- [Apply Skip Hello Verify Migration](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/131)
- [Update Version to v2.5.0](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/133)
- [Update Version to v2.5.1](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/134)
- https://ntc.party/t/in-case-snowflake-rendezvous-gets-blocked/1857/9
- [Reduced User Count in Russia](https://gitlab.torproject.org/tpo/anti-censorship/censorship-analysis/-/issues/40030#note_2863410)
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [x] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
- ### Issue Tracking
## Change Description
This is a merge request includes Remove HelloVerify countermeasure against Russia's censorship of snowflake. Since most snowflake proxy is browser based, users impacted with HelloVerify based censorship should be able to connect to snowflake proxy and server as soon as this patch is applied.shelikhooshelikhoohttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/636Updated release prep gitlab templates2023-01-31T19:39:11ZrichardUpdated release prep gitlab templates## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- none
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploi...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- none
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
Updated release-prep:
- removed now obsolete torbutton steps from stable
- updated push steps to merge since we're just in gitlab now
- updated rebase process to better match how I actually do it
- simplified the tor-browser manual update stepsrichardrichardhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/635Draft: Bug 40737: Prefix alpha/release/nightly directory with projectname2023-01-17T17:39:12ZboklmDraft: Bug 40737: Prefix alpha/release/nightly directory with projectname## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40737
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-da...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- Closes #40737
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset -->boklmboklmhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/634Bug 40744: Ensure reproducibility with HFS DMG2023-01-18T08:26:50ZPier Angelo VendrameBug 40744: Ensure reproducibility with HFS DMG## Merge Info
### Related Issues
- #40744
- #28124
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do no...## Merge Info
### Related Issues
- #40744
- #28124
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [x] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
Makes the changes in !627 reproducible:
- it adds a patch to generate the HFS UUID deterministically starting from the volume label
- restore Mike Perry's patch for `dmg` (the commit in Moz's repo isn't enough, I've opened a PR, let's see if they take it)
- populates the HFS in orderPier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/633Bug 40715: Prepare alpha release 12.5a22023-01-22T17:24:29ZrichardBug 40715: Prepare alpha release 12.5a2## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40715
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser-build#40715
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
Release prep for 12.0a2 (still need to do android security backports on the 17th)richardrichardhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/632Bug 41361: Conjure Integration with Tor Browser on Android2023-01-31T21:26:03ZCecylia BocovichBug 41361: Conjure Integration with Tor Browser on Android## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser#41361
- etc
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fix...## Merge Info
<!-- Bookkeeping information for release management -->
- ### Related Issues
- tor-browser#41361
- etc
- ### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [X] **No Backport** - patchset for the next major stable
- ### Issue Tracking
- [X] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
This is based on https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/618.
This adds support for conjure on android builds. Note that the last commit is a placeholder for once the changes to tor-android-service are merged (https://gitlab.torproject.org/tpo/applications/tor-android-service/-/merge_requests/2)
<!-- Whatever context the reviewer needs to effectively review the patchset -->Cecylia BocovichCecylia Bocovichhttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/631Bug 40742: Add Privacy Browser targets2023-02-01T09:54:20ZPier Angelo VendrameBug 40742: Add Privacy Browser targets## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser-build#40742
- #40745
- #40753
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major ...## Merge Info
<!-- Bookkeeping information for release management -->
### Related Issues
- tor-browser-build#40742
- #40745
- #40753
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [x] **No Backport** - patchset for the next major stable
### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
This MR should allow us to build Privacy Browser build.
It introduces the following changes:
1. it allows us to customize `MOZ_APP_BASENAME`, which has direct effects on the output paths and filenames
2. it adds a few needed files for the Windows and macOS installers
3. it adds the privacybrowser targets
4. it adds the `torbrowser-` prefix to the `Makefile` targets for generating updates
5. it adds `privacybrowser` to the `.gitignore` (and adds back `release`, `alpha` and `nightly` to guarantee compatibility with older builds and with `maint-12.0`)
6. it updates the needed documentation
So far, the builds work, but only if you use the single target.
Group targets (such as desktop) don't work, but I cannot fix them on my own.Pier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_requests/630Bug 40732: Review the Bundle-Data and do not ship the default profile2023-01-16T19:53:46ZPier Angelo VendrameBug 40732: Review the Bundle-Data and do not ship the default profile## Merge Info
### Related Issues
- tor-browser-build#40732
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which...## Merge Info
### Related Issues
- tor-browser-build#40732
### Backport Timeline
- [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
- [x] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
- [ ] **Eventually** - patchset that needs to be verified in alpha before backport
- [ ] **No Backport** - patchset for the next major stable
### Issue Tracking
- [x] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
## Change Description
This commit reviews the entire Bundle-Data mechanism, and it does maybe too many things:
1. we stop shipping Bundle-Data/$osname in base-browser, which results in not shipping a default profile anymore (except for Tor Browser);
2. Linux's start script referred the default profile: we must not do it anymore, and since it isn't required on Linux either, I've just removed these lines also for Tor Browser;
3. In tor-browser!517/tor-browser!518, we've disabled the profile migrator at Firefox build config level: we do not need to ship the `override.ini` anymore (we did for macOS);
4. macOS files in Bundle-Data did not follow the final structure, and we had to move them while building. If I understand correctly, it was legacy, so get rid of it;
5. finally, the commit reworks the template for the .dmg files: instead of having two generic dmg, one to install to /Applications (which is the only one used) and one for ~/Desktop, we now have two templates: one for Tor Browser, and one for Base Browser.
The branch for this MR includes the commit for !627, which should be merged, first, to avoid conflicts with the DMG HFS+Icon changes.Pier Angelo VendramePier Angelo Vendrame