tor-commits

tor-commits@lists.torproject.org

1 participants
212989 discussions

[Git][tpo/applications/tor-browser-build][main] TBB 41382: Replace gitlab templates ReleasePrep label references with...
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 936a656b by hackademix at 2025-02-27T08:58:33+00:00 TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -40,7 +40,7 @@ - [ ] **Other**: please explain ### Issue Tracking -- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Uplifting - [ ] Patchset is a candidate for uplift to upstream projects (e.g. mingw, clang, etc) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 2 commits: fixup! TB 41649: Create rebase and security backport gitlab issue templates
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: fec501a5 by hackademix at 2025-02-27T08:57:38+00:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 797f4ecd by hackademix at 2025-02-27T08:57:38+00:00 fixup! Adding issue and merge request templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 5 changed files: - .gitlab/issue_templates/Backport Android Security Fixes.md - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Legacy.md - .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Rebase.md Changes: ===================================== .gitlab/issue_templates/Backport Android Security Fixes.md ===================================== @@ -18,7 +18,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issues (stable and alpha). +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issues (stable and alpha). ### **Security Vulnerabilities Report**: https://www.mozilla.org/en-US/security/advisories/ ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -27,7 +27,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Legacy.md ===================================== @@ -21,7 +21,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -25,7 +25,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/merge_request_templates/Rebase.md ===================================== @@ -10,7 +10,7 @@ - tor-browser-build#xxxxx ### Issue Tracking -- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Review View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8db5a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8db5a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] fixup! Adding issue and merge request templates
by ma1 (＠ma1) 27 Feb '25

27 Feb '25

ma1 pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 210e0efb by hackademix at 2025-02-26T23:36:38+01:00 fixup! Adding issue and merge request templates TBB 41382: Replace gitlab templates ReleasePrep label references with Apps::Type::ReleasePreparation - - - - - 3 changed files: - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Rebase.md Changes: ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -29,7 +29,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -29,7 +29,7 @@ ### **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. ### Update Branch Protection Rules ===================================== .gitlab/merge_request_templates/Rebase.md ===================================== @@ -10,7 +10,7 @@ - tor-browser-build#xxxxx ### Issue Tracking -- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation ### Review View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/210… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/210… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41379: Bundle some Moat settings with the browser.
by Pier Angelo Vendrame (＠pierov) 27 Feb '25

27 Feb '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 50eeb222 by Pier Angelo Vendrame at 2025-02-27T08:39:38+01:00 Bug 41379: Bundle some Moat settings with the browser. - - - - - 6 changed files: - projects/browser/build - projects/browser/build.android - projects/browser/config - + projects/moat-settings/README.md - + projects/moat-settings/build - + projects/moat-settings/config Changes: ===================================== projects/browser/build ===================================== @@ -125,6 +125,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b rm "$TBDIR/$TORBINPATH/tor-gencert.exe" [% END %] + tar -xf [% c('input_files_by_name/moat-settings') %] [% END -%] for tbdir in "${TBDIRS[@]}" @@ -258,11 +259,11 @@ do tbdir="$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/" [% IF c("var/tor-browser") -%] pushd "$rootdir" - pt_config_dir=chrome/toolkit/content/global - mkdir -p "$pt_config_dir" - cp "pt_config.json" "$pt_config_dir/" - [% c("touch") %] "$pt_config_dir/pt_config.json" - zip -Xm "$tbdir/omni.ja" "$pt_config_dir/pt_config.json" + config_dir=chrome/toolkit/content/global + mkdir -p "$config_dir" + cp moat_countries.json pt_config.json "$config_dir/" + [% c("touch") %] "$config_dir/"*.json + zip -Xm "$tbdir/omni.ja" "$config_dir/moat_countries.json" "$config_dir/pt_config.json" rm -rf chrome popd [% END -%] ===================================== projects/browser/build.android ===================================== @@ -26,7 +26,8 @@ unzip $rootdir/[% c('input_files_by_name/noscript') %] popd [%IF c("var/tor-browser") -%] - tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json + tar -xaf "$rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json + tar -xf "$rootdir/[% c('input_files_by_name/moat-settings') %]" [% END -%] # This function generates a signed APK from a given APK file. @@ -56,8 +57,8 @@ function generate_apk { mkdir omni pushd omni unzip ../omni.ja - [%IF c("var/tor-browser") -%] - cp -an ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json + [% IF c("var/tor-browser") -%] + cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/ [% END -%] [% c('zip', { zip_src => [ '.' ], @@ -68,7 +69,7 @@ function generate_apk { mkdir apk pushd apk 7zz x "$apk" - cp -Rn ../assets ./ + cp -R ../assets ./ find -type f -exec touch -m -t '[% USE date; date.format(pc("geckoview", "timestamp"), format = "%Y%m%d%H%M") %]' {} \; find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt 7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt ===================================== projects/browser/config ===================================== @@ -103,6 +103,9 @@ input_files: enable: '[% c("var/macos_universal") && c("var/tor-browser") %]' target_replace: '^torbrowser-macos.*': torbrowser-macos-aarch64 + - project: moat-settings + name: moat-settings + enable: '[% c("var/tor-browser") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' ===================================== projects/moat-settings/README.md ===================================== @@ -0,0 +1,2 @@ +We use this project to fetch the Moat circumvention data to make sure we have it +even before running non-Tor requests on the browser. ===================================== projects/moat-settings/build ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] + +tar -xf [% project %]-[% c("version") %].tar.[% c('compress_tar') %] [% project %]-[% c("version") %]/conf/circumvention.json +jq -c keys [% project %]-[% c("version") %]/conf/circumvention.json > moat_countries.json + +[% c("touch") %] moat_countries.json +[% c('tar', { + tar_src => 'moat_countries.json', + tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/moat-settings/config ===================================== @@ -0,0 +1,7 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' +git_url: https://gitlab.torproject.org/tpo/anti-censorship/rdsys-admin.git +git_hash: 810fb24bd5fe36c8c0a67ecf8f8ec47b479eee31 +version: '[% c("abbrev") %]' +# Use gz for now, since we do not support Zstandard on Linux containers. +compress_tar: 'gz' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! [android] Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 27 Feb '25

27 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8db5a552 by clairehurst at 2025-02-27T01:14:52+00:00 fixup! [android] Implement Android-native Connection Assist UI This should have been included with the following. Bug 43359: Improper handling of TorBootstrapChangeListener with respect to system onDestroy() calls for HomeActivity - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -452,10 +452,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn components.notificationsDelegate.bindToActivity(this) - val engine = components.core.engine - if (engine is GeckoEngine) { - val torIntegration = engine.getTorIntegrationController() - torIntegration.registerBootstrapStateChangeListener(this) + if (settings().useHtmlConnectionUi) { + val engine = components.core.engine + if (engine is GeckoEngine) { + val torIntegration = engine.getTorIntegrationController() + torIntegration.registerBootstrapStateChangeListener(this) + } } StartupTimeline.onActivityCreateEndHome(this) // DO NOT MOVE ANYTHING BELOW HERE. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8db5a55… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8db5a55… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41381: More flexible tagging script.
by ma1 (＠ma1) 26 Feb '25

26 Feb '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 15ee5d47 by hackademix at 2025-02-26T19:31:28+01:00 Bug 41381: More flexible tagging script. - - - - - 2 changed files: - tools/browser/README.md - tools/browser/sign-tag Changes: ===================================== tools/browser/README.md ===================================== @@ -37,11 +37,11 @@ This script gpg signs a git tag associated with a particular browser commit in t #### Prerequisites -- The user must create the following soft-links: +- The user may create the following soft-links (by default they are automatically pointed to ../../git_clones/firefox): - `/tools/browser/basebrowser` -> `/path/to/local/tor-browser.git` - `/tools/browser/mullvadbrowser` -> `/path/to/local/mullvad-browser.git` - `/tools/browser/torbrowser` -> `/path/to/local/tor-browser.git` -- The user must first checkout the relevant branch of the commit we are tagging +- The user must first checkout the relevant branch (local or remote-tracking) of the commit we are tagging - This is needed to extract the ESR version, branch-number, and browser name #### Usage @@ -93,4 +93,4 @@ Invoke the relevant soft-link'd version of this script to sign a particular brow Tag commit 385aa0559a90 in mullvad-browser-128.4.0esr-14.0-1 tag: mullvad-browser-128.4.0esr-14.0-1-build2 message: Tagging build2 for 128.4.0esr-based stable - ``` \ No newline at end of file + ``` ===================================== tools/browser/sign-tag ===================================== @@ -18,7 +18,9 @@ browser=$(echo "$script_name" | perl -pe 's/^[^\.]+\.//') case "${browser}" in basebrowser | torbrowser | mullvadbrowser) # go down to browser directory - pushd ${script_dir}/${browser} > /dev/null + browser_dir="$script_dir/$browser" + [ -e "$browser_dir" ] || ln -s "../../git_clones/firefox" "$browser_dir" + pushd "$browser_dir" > /dev/null # and exit on script termination trap "popd > /dev/null" EXIT ;; @@ -33,7 +35,7 @@ esac # and message # -branch_name=$(git rev-parse --abbrev-ref HEAD) +branch_name=$(git log -n1 --oneline --decorate=short | grep -Eo '[a-z]+-browser-[1-9][0-9]+[^),]*-[1-9]' | head -n1) if [[ $branch_name =~ ^([a-z]+-browser)-([1-9][0-9]+\.[0-9]+)(\.[0-9]+esr|a[1-9][0-9]*)-([1-9][0-9]*\.[05])-([1-9]).*$ ]]; then project="${BASH_REMATCH[1]}" upstream="${BASH_REMATCH[2]}${BASH_REMATCH[3]}" @@ -77,8 +79,10 @@ commit=$(git rev-parse --short ${3:-HEAD}) # channel validation if [[ "${project}" == "mullvad-browser" ]]; then + repo="$project" valid_channels=("rapid" "alpha" "stable") else + repo="tor-browser" valid_channels=("rapid" "alpha" "stable" "legacy") fi channel_valid=false @@ -113,3 +117,9 @@ echo " tag: ${tag}" echo " message: ${message}" git tag -s "${tag}" "${commit}" -m "${message}" + +read -p "Do you want to push ${tag} to ${repo}.git? (y/N) " -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]]; then + git push "git@gitlab.torproject.org:tpo/applications/${repo}.git" "${tag}" +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_21_0esr_BUILD1
by ma1 (＠ma1) 26 Feb '25

26 Feb '25

ma1 pushed new tag FIREFOX_115_21_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.21.0esr-13.5-1
by ma1 (＠ma1) 26 Feb '25

26 Feb '25

ma1 pushed new branch tor-browser-115.21.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.21.0esr-13.5-1
by ma1 (＠ma1) 26 Feb '25

26 Feb '25

ma1 pushed new branch base-browser-115.21.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.8.0esr-14.0-1] fixup! MB 213: Customize the search engines list
by Pier Angelo Vendrame (＠pierov) 26 Feb '25

26 Feb '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.8.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 96daf684 by Pier Angelo Vendrame at 2025-02-26T17:19:10+01:00 fixup! MB 213: Customize the search engines list MB 395: Make Leta the default search engine. - - - - - 1 changed file: - toolkit/components/search/content/mullvadBrowserSearchEngines.json Changes: ===================================== toolkit/components/search/content/mullvadBrowserSearchEngines.json ===================================== @@ -1,48 +1,48 @@ [ { - "aliases": ["duckduckgo", "ddg"], - "name": "DuckDuckGo", + "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], + "name": "Mullvad Leta", "urls": { "search": { - "base": "https://duckduckgo.com/", + "base": "https://leta.mullvad.net/", "params": [], "searchTermParamName": "q" } }, - "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", - "identifier": "ddg", + "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", + "identifier": "mullvad-leta", "recordType": "engine", "orderHint": 100, "variants": [] }, { - "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], - "name": "DuckDuckGo (HTML)", + "aliases": ["duckduckgo", "ddg"], + "name": "DuckDuckGo", "urls": { "search": { - "base": "https://html.duckduckgo.com/html/", + "base": "https://duckduckgo.com/", "params": [], "searchTermParamName": "q" } }, - "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", - "identifier": "ddg-html", + "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", + "identifier": "ddg", "recordType": "engine", "orderHint": 90, "variants": [] }, { - "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], - "name": "Mullvad Leta", + "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], + "name": "DuckDuckGo (HTML)", "urls": { "search": { - "base": "https://leta.mullvad.net/", + "base": "https://html.duckduckgo.com/html/", "params": [], "searchTermParamName": "q" } }, - "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", - "identifier": "mullvad-leta", + "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", + "identifier": "ddg-html", "recordType": "engine", "orderHint": 80, "variants": [] View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/96d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/96d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits