- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-update-responses][main] 7 commits: alpha: new version, 14.5a5 (linux-i686)
by Pier Angelo Vendrame (＠pierov) 21 Mar '25

21 Mar '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 84a2233b by Pier Angelo Vendrame at 2025-03-21T12:07:29+01:00 alpha: new version, 14.5a5 (linux-i686) - - - - - f53b95c3 by Pier Angelo Vendrame at 2025-03-21T12:07:29+01:00 alpha: new version, 14.5a5 (linux-x86_64) - - - - - cc9ec54d by Pier Angelo Vendrame at 2025-03-21T12:07:29+01:00 alpha: new version, 14.5a5 (macos) - - - - - 6003d167 by Pier Angelo Vendrame at 2025-03-21T12:07:30+01:00 alpha: new version, 14.5a5 (windows-i686) - - - - - 5770a263 by Pier Angelo Vendrame at 2025-03-21T12:07:30+01:00 alpha: new version, 14.5a5 (windows-x86_64) - - - - - b8f0a88d by Pier Angelo Vendrame at 2025-03-21T12:07:30+01:00 alpha: new version, 14.5a5 (android) - - - - - fa12856f by Pier Angelo Vendrame at 2025-03-21T12:07:30+01:00 alpha: new version, 14.5a5 - - - - - 43 changed files: - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json - update_3/alpha/downloads.json - update_3/alpha/linux-i686/.htaccess - update_3/alpha/linux-i686/14.5a1-14.5a4-linux-i686.xml → update_3/alpha/linux-i686/14.5a2-14.5a5-linux-i686.xml - update_3/alpha/linux-i686/14.5a2-14.5a4-linux-i686.xml → update_3/alpha/linux-i686/14.5a3-14.5a5-linux-i686.xml - update_3/alpha/linux-i686/14.5a3-14.5a4-linux-i686.xml → update_3/alpha/linux-i686/14.5a4-14.5a5-linux-i686.xml - update_3/alpha/linux-i686/14.5a4-linux-i686.xml → update_3/alpha/linux-i686/14.5a5-linux-i686.xml - update_3/alpha/linux-x86_64/.htaccess - update_3/alpha/linux-x86_64/14.5a1-14.5a4-linux-x86_64.xml → update_3/alpha/linux-x86_64/14.5a2-14.5a5-linux-x86_64.xml - update_3/alpha/linux-x86_64/14.5a2-14.5a4-linux-x86_64.xml → update_3/alpha/linux-x86_64/14.5a3-14.5a5-linux-x86_64.xml - update_3/alpha/linux-x86_64/14.5a3-14.5a4-linux-x86_64.xml → update_3/alpha/linux-x86_64/14.5a4-14.5a5-linux-x86_64.xml - update_3/alpha/linux-x86_64/14.5a4-linux-x86_64.xml → update_3/alpha/linux-x86_64/14.5a5-linux-x86_64.xml - update_3/alpha/macos/.htaccess - update_3/alpha/macos/14.5a3-14.5a4-macos.xml → update_3/alpha/macos/14.5a2-14.5a5-macos.xml - update_3/alpha/macos/14.5a1-14.5a4-macos.xml → update_3/alpha/macos/14.5a3-14.5a5-macos.xml - update_3/alpha/macos/14.5a2-14.5a4-macos.xml → update_3/alpha/macos/14.5a4-14.5a5-macos.xml - update_3/alpha/macos/14.5a4-macos.xml → update_3/alpha/macos/14.5a5-macos.xml - update_3/alpha/windows-i686/.htaccess - − update_3/alpha/windows-i686/14.5a1-14.5a4-windows-i686.xml - − update_3/alpha/windows-i686/14.5a2-14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a2-14.5a5-windows-i686.xml - − update_3/alpha/windows-i686/14.5a3-14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a3-14.5a5-windows-i686.xml - + update_3/alpha/windows-i686/14.5a4-14.5a5-windows-i686.xml - − update_3/alpha/windows-i686/14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a5-windows-i686.xml - update_3/alpha/windows-x86_64/.htaccess - − update_3/alpha/windows-x86_64/14.5a1-14.5a4-windows-x86_64.xml - − update_3/alpha/windows-x86_64/14.5a2-14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a2-14.5a5-windows-x86_64.xml - − update_3/alpha/windows-x86_64/14.5a3-14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a3-14.5a5-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a4-14.5a5-windows-x86_64.xml - − update_3/alpha/windows-x86_64/14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a5-windows-x86_64.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41403: Reorder the definitions in generate_config.
by Pier Angelo Vendrame (＠pierov) 21 Mar '25

21 Mar '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3925e37e by Pier Angelo Vendrame at 2025-03-21T09:25:50+01:00 Bug 41403: Reorder the definitions in generate_config. We need to define the variables about channel and version before the signing configuration. - - - - - 1 changed file: - tools/signing/functions Changes: ===================================== tools/signing/functions ===================================== @@ -30,24 +30,24 @@ function is_project { } function generate_config { + local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \ + --target "$SIGNING_PROJECTNAME") + local tbb_version=$("$rbm" showconf browser var/torbrowser_version \ + --target "$SIGNING_PROJECTNAME" --target \ + "$tbb_version_type") + local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \ + --target "$SIGNING_PROJECTNAME" --target \ + "$tbb_version_type") local p1=$("$rbm" showconf browser var/project-name --target \ "$SIGNING_PROJECTNAME") local p2=$("$rbm" showconf browser var/Project_Name --target \ "$SIGNING_PROJECTNAME") local p3=$("$rbm" showconf browser var/ProjectName --target \ "$SIGNING_PROJECTNAME") - p4=$("$rbm" showconf browser var/display_name --target \ + local p4=$("$rbm" showconf browser var/display_name --target \ "$SIGNING_PROJECTNAME" --target "$tbb_version_type") echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \ "$script_dir/set-config.generated-config" - local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \ - --target "$SIGNING_PROJECTNAME") - local tbb_version=$("$rbm" showconf browser var/torbrowser_version \ - --target "$SIGNING_PROJECTNAME" --target \ - "$tbb_version_type") - local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \ - --target "$SIGNING_PROJECTNAME" --target \ - "$tbb_version_type") for v in tbb_version_type tbb_version tbb_version_build; do echo "$v=$(shell-quote "${!v}")" >> "$script_dir/set-config.generated-config" done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][asciiwolf-rdns-desktop-files] Rename desktop files to rDNS format
by asciiwolf (＠asciiwolf) 20 Mar '25

20 Mar '25

asciiwolf pushed to branch asciiwolf-rdns-desktop-files at The Tor Project / Applications / torbrowser-launcher Commits: ab97d7f9 by AsciiWolf at 2025-03-20T22:36:16+01:00 Rename desktop files to rDNS format As recommended by the Desktop Entry Specification and already used on Flathub. Also fix the icon path in torbrowser_launcher/common.py - - - - - 6 changed files: - share/applications/torbrowser.desktop → share/applications/org.torproject.torbrowser-launcher.desktop - share/applications/torbrowser-settings.desktop → share/applications/org.torproject.torbrowser-launcher.settings.desktop - share/icons/hicolor/128x128/apps/torbrowser.png → share/icons/hicolor/128x128/apps/org.torproject.torbrowser-launcher.png - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml - torbrowser_launcher/__init__.py - torbrowser_launcher/common.py Changes: ===================================== share/applications/torbrowser.desktop → share/applications/org.torproject.torbrowser-launcher.desktop ===================================== @@ -26,6 +26,6 @@ Comment[tr]=Tor Browser Başlat Exec=torbrowser-launcher %u Terminal=false Type=Application -Icon=torbrowser +Icon=org.torproject.torbrowser-launcher Categories=Network;WebBrowser; StartupWMClass=Tor Browser ===================================== share/applications/torbrowser-settings.desktop → share/applications/org.torproject.torbrowser-launcher.settings.desktop ===================================== @@ -32,5 +32,5 @@ Comment[tr]=Tor Browser Başlatıcı Ayarları Exec=torbrowser-launcher --settings Terminal=false Type=Application -Icon=torbrowser +Icon=org.torproject.torbrowser-launcher Categories=Network;WebBrowser; ===================================== share/icons/hicolor/128x128/apps/torbrowser.png → share/icons/hicolor/128x128/apps/org.torproject.torbrowser-launcher.png ===================================== ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -3,7 +3,7 @@  <component type="desktop-application"> <id>org.torproject.torbrowser-launcher</id> - <launchable type="desktop-id">torbrowser.desktop</launchable> + <launchable type="desktop-id">org.torproject.torbrowser-launcher.desktop</launchable> <metadata_license>CC0-1.0</metadata_license> <project_license>MIT</project_license> <name>Tor Browser Launcher</name> ===================================== torbrowser_launcher/__init__.py ===================================== @@ -82,7 +82,7 @@ def main(): app = Application() if "WAYLAND_DISPLAY" in os.environ: - app.setDesktopFileName("torbrowser") + app.setDesktopFileName("org.torproject.torbrowser-launcher") # Open the window gui = None ===================================== torbrowser_launcher/common.py ===================================== @@ -126,7 +126,7 @@ class Common(object): "old_data_dir": old_tbb_data, "tbl_bin": sys.argv[0], "icon_file": os.path.join( - os.path.dirname(SHARE), "pixmaps/torbrowser.png" + os.path.dirname(SHARE), "icons/hicolor/128x128/apps/org.torproject.torbrowser-launcher.png" ), "torproject_pem": os.path.join(SHARE, "torproject.pem"), "signing_keys": { View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-14.5a5-build1
by Pier Angelo Vendrame (＠pierov) 20 Mar '25

20 Mar '25

Pier Angelo Vendrame pushed new tag mb-14.5a5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-14.5a5-build1
by Pier Angelo Vendrame (＠pierov) 20 Mar '25

20 Mar '25

Pier Angelo Vendrame pushed new tag tbb-14.5a5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41402: Fix Snowflake 2.11.0 for Android with Go 1.23.
by Pier Angelo Vendrame (＠pierov) 20 Mar '25

20 Mar '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6b9b3490 by Pier Angelo Vendrame at 2025-03-20T19:40:46+01:00 Bug 41402: Fix Snowflake 2.11.0 for Android with Go 1.23. - - - - - 4651f8e8 by Pier Angelo Vendrame at 2025-03-20T19:41:36+01:00 Bug 41390,41391: Prepare Tor+Mullvad Browser 14.5a5 - - - - - 8 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/snowflake/build - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,17 @@ +Mullvad Browser 14.5a5 - March 21 2025 + * All Platforms + * Updated uBlock Origin to 1.63.0 + * Bug 412: Link the release page in the about dialog and clean brand-related preferences [mullvad-browser] + * Bug 41051: Replace Noto Sans Myanmar with Pyidaungsu [tor-browser] + * Bug 41755: Show the link to about:support in the help menu [tor-browser] + * Bug 42670: Letterboxing visible even if disable with tiled window managers [tor-browser] + * Build System + * All Platforms + * Bug 41394: Fix upload-update_responses-to-staticiforme for mullvadbrowser [tor-browser-build] + * Bug 41401: Replace Noto Sans Myanmar with Pyidaungsu [tor-browser-build] + * Linux + * Bug 41397: Building mullvad-browser no longer generates .deb or .rpm packages [tor-browser-build] + Mullvad Browser 14.5a4 - March 12 2025 * All Platforms * Updated Firefox to 128.8.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,38 @@ +Tor Browser 14.5a5 - March 21 2025 + * All Platforms + * Updated Lyrebird to 0.6.0 + * Updated Snowflake to 2.11.0 + * Bug 42300: Do not store logs inside TorProvider [tor-browser] + * Bug 43488: Handle Moat connection errors and other non-bootstrapping errors in TorConnect [tor-browser] + * Bug 43490: Use lower case "n" for "Tor network" in the UI [tor-browser] + * Bug 43556: Update Desktop and Android survey dismissal string [tor-browser] + * Bug 43575: Cleanup channel preferences [tor-browser] + * Windows + macOS + Linux + * Bug 41051: Replace Noto Sans Myanmar with Pyidaungsu [tor-browser] + * Bug 41755: Show the link to about:support in the help menu [tor-browser] + * Bug 42550: Do not re-try auto-bootstrapping after the user selects a specific region in about:torconnect [tor-browser] + * Bug 42656: about:torconnect new url location override (maybeUpdateOpenLocationForTorConnect) mostly does nothing [tor-browser] + * Bug 42670: Letterboxing visible even if disable with tiled window managers [tor-browser] + * Bug 42720: Link to release notes missing from "About Tor Browser" window [tor-browser] + * Bug 43321: Do not focus the connect button if the user has never connected before [tor-browser] + * Bug 43405: Handle failing to apply tor settings [tor-browser] + * Android + * Bug 41188: Implement Android-native Connection Assist UI [tor-browser] + * Bug 42251: Expose TorConnect lifecycle events to fenix [tor-browser] + * Bug 43091: Delete unused android strings [tor-browser] + * Bug 43361: [Android] Move code relating to `onTerminate()` in `FenixApplication.kt` [tor-browser] + * Bug 43473: Rename "Quickstart" toggle as "Connect automatically" (Android) [tor-browser] + * Bug 43505: Implement User Survey UX (Android) [tor-browser] + * Build System + * All Platforms + * Bug 41394: Fix upload-update_responses-to-staticiforme for mullvadbrowser [tor-browser-build] + * Bug 41398: Build snowflake from main on nightlies [tor-browser-build] + * Bug 41399: Update snowflake to 2.11.0 and lyrebird to 0.6.0 [tor-browser-build] + * Windows + macOS + Linux + * Bug 41401: Replace Noto Sans Myanmar with Pyidaungsu [tor-browser-build] + * Android + * Bug 41402: Fix Snowflake 2.11.0 on Android [tor-browser-build] + Tor Browser 14.5a4 - March 12 2025 * All Platforms * Updated OpenSSL to 3.0.16 ===================================== projects/browser/config ===================================== @@ -114,9 +114,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4411102/noscript-12.1.1.x… name: noscript sha256sum: f9639e63ffcfc352036de00e4ff6694bb0ca65a0bb8fbd103bd08f32dc1ff31a - - URL: https://addons.mozilla.org/firefox/downloads/file/4412673/ublock_origin-1.6… + - URL: https://addons.mozilla.org/firefox/downloads/file/4456610/ublock_origin-1.6… name: ublock-origin - sha256sum: 8a9e02aa838c302fb14e2b5bc88a6036d36358aadd6f95168a145af2018ef1a3 + sha256sum: 8a208284b53565957c878a93b717b46ea0d079cb097214062b76bb96dc18a0f4 enable: '[% c("var/mullvad-browser") %]' - URL: https://cdn.mullvad.net/browser-extension/0.9.4/mullvad-browser-extension-0… name: mullvad-extension ===================================== projects/firefox/config ===================================== @@ -20,7 +20,7 @@ var: browser_series: '14.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -22,7 +22,7 @@ var: browser_series: '14.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' deps: ===================================== projects/snowflake/build ===================================== @@ -18,7 +18,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %] cd client -go build -ldflags '-s' -tags 'nopshufb,noasm,packetioSizeHardlimit,purego,safe,appengine,disableunsafe' +go build -ldflags '-s[% IF c("var/android") %] -checklinkname=0[% END %]' -tags 'nopshufb,noasm,packetioSizeHardlimit,purego,safe,appengine,disableunsafe' cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 292c09a35bcda153068e77a35107baf034929067 + git_hash: 86fc2c2f873ef1df7cb564aa683c0ba7c2071185 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: f969264d8ca95f8d75a8dfcd61b78cb7f7e5f385 + git_hash: 3bd4b0f7867b3539d0963fa0b5ce2c425cc94df7 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 16ce780d14da56fd304d2bde886848a6ca19d512 + git_hash: 550f0663ad92e56f1d3cf1660309f55e1fc0dabb compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,11 +73,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '14.5a4' + torbrowser_version: '14.5a5' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/03/11 16:46:53' + browser_release_date: '2025/03/20 18:10:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_default_channel: alpha browser_platforms: @@ -96,9 +96,9 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.5a4 - 14.5a3 - 14.5a2 - - 14.5a1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-128.8.0esr-14.5-1-build3
by Pier Angelo Vendrame (＠pierov) 20 Mar '25

20 Mar '25

Pier Angelo Vendrame pushed new tag tor-browser-128.8.0esr-14.5-1-build3 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/mullvad-browser] Pushed new tag mullvad-browser-128.8.0esr-14.5-1-build3
by Pier Angelo Vendrame (＠pierov) 20 Mar '25

20 Mar '25

Pier Angelo Vendrame pushed new tag mullvad-browser-128.8.0esr-14.5-1-build3 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] fixup! TB 40597: Implement TorSettings module
by henry (＠henry) 20 Mar '25

20 Mar '25

henry pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4aeac6bb by Henry Wilkes at 2025-03-20T18:17:26+00:00 fixup! TB 40597: Implement TorSettings module TB 43488: Skip straight to "FinalError" if we do not get an expected TorConnectError. - - - - - 1 changed file: - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -1441,28 +1441,45 @@ export const TorConnect = { this._signalError(error); + let errorStage = TorConnectStage.FinalError; + switch (beginStage) { case TorConnectStage.Start: case TorConnectStage.Offline: - this._setStage(TorConnectStage.ChooseRegion); - return; + if ( + error instanceof TorConnectError && + error.code === TorConnectError.BootstrapError + ) { + errorStage = TorConnectStage.ChooseRegion; + } + // Else, some other unexpected error type. Skip straight to the + // "FinalError". See tor-browser#43488. + break; case TorConnectStage.ChooseRegion: - if (regionCode === "automatic") { + // TODO: Handle a Moat error of the type + // DomainFrontRequestNetworkError to show a different stage. See + // tor-browser#43569. + if ( + regionCode === "automatic" && + error instanceof TorConnectError && + (error.code === TorConnectError.AllSettingsFailed || + error.code === TorConnectError.CannotDetermineCountry || + error.code === TorConnectError.NoSettingsForCountry) + ) { // The automatic region failed. - if (bootstrapAttempt.detectedRegion) { - this._setStage(TorConnectStage.ConfirmRegion); - } else { - this._setStage(TorConnectStage.RegionNotFound); - } - return; + errorStage = bootstrapAttempt.detectedRegion + ? TorConnectStage.ConfirmRegion + : TorConnectStage.RegionNotFound; } // Else, not automatic. Go straight to the final error since the user // is unlikely to succeed re-selecting the same region and it would be // unexpected for the user to select a different region. // See tor-browser#42550. + // Else, some other error type. Skip straight to the "FinalError". See + // tor-browser#43488. break; } - this._setStage(TorConnectStage.FinalError); + this._setStage(errorStage); return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4aeac6b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4aeac6b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 2 commits: fixup! TB 7494: Create local home page for TBB.
by morgan (＠morgan) 20 Mar '25

20 Mar '25

morgan pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: e063bf8b by Henry Wilkes at 2025-03-20T17:31:47+00:00 fixup! TB 7494: Create local home page for TBB. TB 43556: Rename "Not now" to "Dismiss" in the survey banner. - - - - - f37f63bc by Henry Wilkes at 2025-03-20T17:31:47+00:00 fixup! Bug 43505 [android]: Add 2025 UX Survey Campaign TB 43556: Update the "Dismiss" translations in the survey banner. - - - - - 2 changed files: - browser/components/abouttor/content/aboutTor.js - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/CampaignStrings.kt Changes: ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -238,7 +238,7 @@ const SurveyArea = { heading: "We’d love your feedback", body: "Help us improve Tor Browser by completing this 10-minute survey.", launch: "Launch the survey", - dismiss: "Not now", + dismiss: "Dismiss", close: "Close", }, }, @@ -250,7 +250,7 @@ const SurveyArea = { heading: "Danos tu opinión", body: "Ayúdanos a mejorar el Navegador Tor completando esta encuesta de 10 minutos.", launch: "Iniciar la encuesta", - dismiss: "Más adelante", + dismiss: "Descartar", close: "Cerrar", }, }, @@ -262,7 +262,7 @@ const SurveyArea = { heading: "Мы будем рады вашим отзывам", body: "Помогите нам улучшить браузер Tor, пройдя 10-минутный опрос.", launch: "Начать опрос", - dismiss: "Не сейчас", + dismiss: "Отклонить", close: "Закрыть", }, }, @@ -274,7 +274,7 @@ const SurveyArea = { heading: "Nous serions ravis d’avoir votre avis !", body: "Aidez-nous à améliorer le navigateur Tor en répondant à cette enquête de 10 minutes.", launch: "Lancer l'enquête", - dismiss: "Pas maintenant", + dismiss: "Ignorer", close: "Fermer", }, }, @@ -287,7 +287,7 @@ const SurveyArea = { heading: "Adoraríamos ouvir sua opinião", body: "Ajude-nos a melhorar o Navegador Tor respondendo a esta pesquisa de 10 minutos.", launch: "Iniciar a pesquisa", - dismiss: "Mais tarde", + dismiss: "Dispensar", close: "Fechar", }, }, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/CampaignStrings.kt ===================================== @@ -22,21 +22,21 @@ object CampaignStrings { HeaderKey to "Danos tu opinión", BodyKey to "Ayúdanos a mejorar el Navegador Tor completando esta encuesta de 10 minutos.", CTAKey to "Iniciar la encuesta", - DismissKey to "Cerrar", + DismissKey to "Descartar", CloseKey to "Cerrar", ), "ru" to hashMapOf( HeaderKey to "Мы будем рады вашим отзывам", BodyKey to "Помогите нам улучшить браузер Tor, пройдя 10-минутный опрос.", CTAKey to "Начать опрос", - DismissKey to "Закрыть", + DismissKey to "Отклонить", CloseKey to "Закрыть", ), "fr" to hashMapOf( HeaderKey to "Nous serions ravis d’avoir votre avis !", BodyKey to "Aidez-nous à améliorer le navigateur Tor en répondant à cette enquête de 10 minutes.", CTAKey to "Lancer l'enquête", - DismissKey to "Fermer", + DismissKey to "Ignorer", CloseKey to "Fermer", ), "pt" to hashMapOf( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3ebeb2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3ebeb2… You're receiving this email because of your account on gitlab.torproject.org.

1 0