- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.11.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 07 May '24

07 May '24

Pier Angelo Vendrame pushed new branch tor-browser-115.11.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. 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 tag FIREFOX_115_11_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 06 May '24

06 May '24

Pier Angelo Vendrame pushed new tag FIREFOX_115_11_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. 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/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] fixup! MB 1: Mullvad Browser branding
by Pier Angelo Vendrame (＠pierov) 06 May '24

06 May '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: dd21380f by Pier Angelo Vendrame at 2024-05-06T09:16:59+02:00 fixup! MB 1: Mullvad Browser branding MB 284: Customize logs in about:debugging. - - - - - 4 changed files: - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg Changes: ===================================== devtools/client/aboutdebugging/src/actions/runtimes.js ===================================== @@ -60,25 +60,7 @@ const CONNECTION_TIMING_OUT_DELAY = 3000; const CONNECTION_CANCEL_DELAY = 13000; async function getRuntimeIcon(runtime, channel) { - if (runtime.isFenix) { - switch (channel) { - case "release": - case "beta": - return "chrome://devtools/skin/images/aboutdebugging-fenix.svg"; - case "aurora": - default: - return "chrome://devtools/skin/images/aboutdebugging-fenix-nightly.svg"; - } - } - - // Use the release build skin for devtools within Tor Browser alpha releases. - if (channel === "alpha") { - return "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg"; - } - - return channel === "release" || channel === "beta" || channel === "aurora" - ? `chrome://devtools/skin/images/aboutdebugging-firefox-${channel}.svg` - : "chrome://devtools/skin/images/aboutdebugging-firefox-nightly.svg"; + return "chrome://branding/content/about-logo.svg"; } function onRemoteDevToolsClientClosed() { ===================================== devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js ===================================== @@ -43,7 +43,7 @@ const RefreshDevicesButton = createFactory( require("resource://devtools/client/aboutdebugging/src/components/sidebar/RefreshDevicesButton.js") ); const FIREFOX_ICON = - "chrome://devtools/skin/images/aboutdebugging-firefox-logo.svg"; + "chrome://devtools/skin/images/aboutdebugging-mullvadbrowser-logo.svg"; const CONNECT_ICON = "chrome://devtools/skin/images/settings.svg"; const GLOBE_ICON = "chrome://devtools/skin/images/aboutdebugging-globe-icon.svg"; ===================================== devtools/client/jar.mn ===================================== @@ -374,6 +374,7 @@ devtools.jar: skin/images/aboutdebugging-firefox-release.svg (themes/images/aboutdebugging-firefox-release.svg) skin/images/aboutdebugging-globe-icon.svg (themes/images/aboutdebugging-globe-icon.svg) skin/images/aboutdebugging-information.svg (themes/images/aboutdebugging-information.svg) + skin/images/aboutdebugging-mullvadbrowser-logo.svg (themes/images/aboutdebugging-mullvadbrowser-logo.svg) skin/images/aboutdebugging-process-icon.svg (themes/images/aboutdebugging-process-icon.svg) skin/images/aboutdebugging-usb-icon.svg (themes/images/aboutdebugging-usb-icon.svg) content/aboutdebugging/index.html (aboutdebugging/index.html) ===================================== devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg ===================================== @@ -0,0 +1,3 @@ +<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M13.125 8.125C10.3636 8.125 8.125 10.3636 8.125 13.125V66.875C8.125 69.6364 10.3636 71.875 13.125 71.875H66.875C69.6364 71.875 71.875 69.6364 71.875 66.875V13.125C71.875 10.3636 69.6364 8.125 66.875 8.125H13.125ZM17.5 16.875H27L40 41.5L53 16.875H62.5V63.75H53V39.25L46.5 51.625H33.5L27 39.25V63.75H17.5V16.875Z" fill="context-fill"/> +</svg> View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/dd2… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/dd2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: MB 295: Change to browser directory instead of HOME in system install
by boklm (＠boklm) 06 May '24

06 May '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4d541c5a by Nicolas Vigier at 2024-05-03T08:10:49+02:00 MB 295: Change to browser directory instead of HOME in system install - - - - - 3774a75a by Nicolas Vigier at 2024-05-03T08:15:15+02:00 Bug 41135: Don't use full path to start the browser Using the full path instead of `./` to start the browser seems to break KeePassXC-Browser. - - - - - 1 changed file: - projects/browser/RelativeLink/start-browser Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -396,7 +396,7 @@ export GSETTINGS_BACKEND=memory # $HOME/.cache/nvidia. We we can easily disable it. export __GL_SHADER_DISK_CACHE=0 -cd "${HOME}" +cd "$browser_dir" # We pass all additional command-line arguments we get to Firefox. # @@ -408,18 +408,18 @@ cd "${HOME}" if [ "$show_usage" -eq 1 ]; then # Display Firefox help, then our help - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] --help 2>/dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] --help 2>/dev/null print_usage elif [ "$detach" -eq 1 ] ; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null & + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" 2>&1 </dev/null | \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" 2>&1 </dev/null | \ tee "$logfile" elif [ "$show_output" -eq 1 ]; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" < /dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" < /dev/null else - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null fi exit $? View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- This project does not include diff previews in email notifications. 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-build][maint-13.0] Bug 42535 (TB): Fix Japanese translation paths.
by Pier Angelo Vendrame (＠pierov) 02 May '24

02 May '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 0e074a38 by Pier Angelo Vendrame at 2024-05-02T17:10:10+02:00 Bug 42535 (TB): Fix Japanese translation paths. When we setup packaged locales, it seemed that Japanese files needed to be in torbutton/locale/ja also for macOS, instead of ja-JP-mac. However, recently we saw that Firefox cannot find brand.ftl in ja, and the legacy files work also in ja-JP-mac. Maybe the initial tests were influenced by some cache. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -132,15 +132,15 @@ mkdir "$HOME/.mozbuild" torbutton_locales="toolkit/torbutton/chrome/locale/" torbutton_jar="toolkit/torbutton/jar.mn" for lang in $supported_locales; do - central_lang=$lang + source_lang=$lang [% IF c("var/macos") -%] if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" + source_lang="ja" fi [% END -%] - mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$central_lang/browser/browser/" - mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/" - mv "$transl_tor_browser/$lang" "$torbutton_locales/" + mv "$transl_tor_browser/$source_lang/tor-browser.ftl" "$l10ncentral/$lang/browser/browser/" + mv "$transl_tor_browser/$source_lang/cryptoSafetyPrompt.properties" "$l10ncentral/$lang/browser/chrome/browser/" + mv "$transl_tor_browser/$source_lang" "$torbutton_locales/$lang" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 02 May '24

02 May '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f8bdd0d3 by Henry Wilkes at 2024-05-01T15:26:43+01:00 fixup! Add TorStrings module for localization Bug 42549: Remove brand.dtd - - - - - 8 changed files: - − browser/base/content/browser-doctype.inc - browser/base/content/browser.xhtml - browser/base/content/hiddenWindowMac.xhtml - browser/base/content/pageinfo/pageInfo.xhtml - browser/components/places/content/places.xhtml - browser/components/shell/content/setDesktopBackground.xhtml - − toolkit/torbutton/chrome/locale/en-US/brand.dtd - toolkit/torbutton/jar.mn Changes: ===================================== browser/base/content/browser-doctype.inc deleted ===================================== @@ -1,4 +0,0 @@ -<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > -%brandDTD; -<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd"> -%torbuttonDTD; ===================================== browser/base/content/browser.xhtml ===================================== @@ -41,7 +41,8 @@ <?xml-stylesheet href="chrome://global/content/torconnect/torConnectTitlebarStatus.css" type="text/css"?> <!DOCTYPE window [ -#include browser-doctype.inc + <!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd"> +%torbuttonDTD; ]> <html id="main-window" ===================================== browser/base/content/hiddenWindowMac.xhtml ===================================== @@ -8,10 +8,6 @@ <?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?> -<!DOCTYPE window [ -#include browser-doctype.inc -]> - <window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" ===================================== browser/base/content/pageinfo/pageInfo.xhtml ===================================== @@ -6,12 +6,6 @@ <?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?> -<!DOCTYPE window [ -#ifdef XP_MACOSX -#include ../browser-doctype.inc -#endif -]> - <window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" ===================================== browser/components/places/content/places.xhtml ===================================== @@ -16,11 +16,7 @@ <?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?> <?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?> -<!DOCTYPE window [ -#ifdef XP_MACOSX -#include ../../../base/content/browser-doctype.inc -#endif -]> +<!DOCTYPE window> <window id="places" data-l10n-id="places-library3" ===================================== browser/components/shell/content/setDesktopBackground.xhtml ===================================== @@ -7,12 +7,6 @@ <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?> -<!DOCTYPE window [ -#ifdef XP_MACOSX -#include ../../../base/content/browser-doctype.inc -#endif -]> - <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" windowtype="Shell:SetDesktopBackground" ===================================== toolkit/torbutton/chrome/locale/en-US/brand.dtd deleted ===================================== @@ -1,9 +0,0 @@ - - -<!ENTITY brandShortName "Tor Browser"> - - -<!ENTITY vendorShortName "Tor Project"> ===================================== toolkit/torbutton/jar.mn ===================================== @@ -5,7 +5,6 @@ torbutton.jar: % category l10n-registry torbutton resource://torbutton/locale/{locale}/ # browser branding -% override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd % override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties # Strings for the about:tbupdate page View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f8bdd0d… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f8bdd0d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 01 May '24

01 May '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 4d86739b by clairehurst at 2024-04-30T15:25:18-06:00 fixup! Implement Android-native Connection Assist UI - - - - - 6 changed files: - + fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + fenix/app/src/main/res/drawable/browser_location.xml - fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt ===================================== @@ -0,0 +1,288 @@ +package org.mozilla.fenix.tor + +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import androidx.annotation.IntRange +import androidx.annotation.StringRes +import org.mozilla.fenix.R + +enum class ConnectAssistUiState( + val progressBarVisible: Boolean, + @IntRange(0, 100) var progress: Int = 0, + @ColorRes val progressTintColorResource: Int? = null, + val backButtonVisible: Boolean, + val settingsButtonVisible: Boolean, + val torConnectImageVisible: Boolean, + @DrawableRes val torConnectImageResource: Int = R.drawable.connect, + val titleLargeTextViewVisible: Boolean, + @StringRes val titleLargeTextViewTextStringResource: Int = R.string.connection_assist_tor_connect_title, + val titleDescriptionVisible: Boolean, + @StringRes val learnMoreStringResource: Int? = null, + @StringRes val internetErrorDescription: Int? = null, + @StringRes val internetErrorDescription1: Int? = null, + @StringRes val internetErrorDescription2: Int? = null, + @StringRes val titleDescriptionTextStringResource: Int? = R.string.preferences_tor_network_settings_explanation, + val quickstartSwitchVisible: Boolean, + val unblockTheInternetInCountryDescriptionVisible: Boolean, + val countryDropDownVisible: Boolean, + val torBootstrapButton1Visible: Boolean, + @StringRes val torBootstrapButton1TextStringResource: Int = R.string.tor_bootstrap_connect, + val torBootstrapButton1ShouldShowTryingABridge: Boolean = false, + val torBootstrapButton2Visible: Boolean, + @StringRes val torBootstrapButton2TextStringResource: Int? = R.string.connection_assist_configure_connection_button, + val torBootstrapButton2ShouldOpenSettings: Boolean = true, + val wordmarkLogoVisible: Boolean, +) { + Splash( + progressBarVisible = false, + backButtonVisible = false, + settingsButtonVisible = false, + torConnectImageVisible = false, + titleLargeTextViewVisible = false, + titleDescriptionVisible = false, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = false, + torBootstrapButton2Visible = false, + wordmarkLogoVisible = true, + ), + Configuring( + progressBarVisible = false, + progress = 0, + backButtonVisible = false, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_tor_connect_title, + titleDescriptionVisible = true, + titleDescriptionTextStringResource = R.string.preferences_tor_network_settings_explanation, + quickstartSwitchVisible = true, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = true, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.connection_assist_configure_connection_button, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ), + Bootstrapping( + progressBarVisible = true, + progress = 0, + backButtonVisible = false, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_connecting_title, + titleDescriptionVisible = true, + titleDescriptionTextStringResource = R.string.preferences_tor_network_settings_explanation, + quickstartSwitchVisible = true, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = false, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.btn_cancel, + torBootstrapButton2ShouldOpenSettings = false, + wordmarkLogoVisible = false, + ), + InternetError( + progressBarVisible = true, + progress = 100, + progressTintColorResource = R.color.warning_yellow, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.globe_broken, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_internet_error_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_internet_error_learn_more, + internetErrorDescription = R.string.connection_assist_internet_error_description, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = true, + torBootstrapButton1TextStringResource = R.string.connection_assist_internet_error_try_again, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.connection_assist_configure_connection_button, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ), + TryingAgain( + progressBarVisible = true, + progress = 0, + progressTintColorResource = null, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_trying_again_waiting_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_internet_error_learn_more, + internetErrorDescription = R.string.connection_assist_internet_error_description, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = false, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.btn_cancel, + torBootstrapButton2ShouldOpenSettings = false, + wordmarkLogoVisible = false, + ), + TryABridge( + progressBarVisible = true, + progress = 100, + progressTintColorResource = R.color.warning_yellow, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect_broken, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_cant_connect_to_tor_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_internet_error_learn_more, + internetErrorDescription = R.string.connection_assist_try_a_bridge_description, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = true, + countryDropDownVisible = true, + torBootstrapButton1Visible = true, + torBootstrapButton1TextStringResource = R.string.connection_assist_try_a_bridge_button, + torBootstrapButton1ShouldShowTryingABridge = true, + torBootstrapButton2Visible = false, + torBootstrapButton2TextStringResource = null, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ), + TryingABridge( + progressBarVisible = true, + progress = 0, + progressTintColorResource = null, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_trying_a_bridge_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_internet_error_learn_more, + internetErrorDescription = R.string.connection_assist_try_a_bridge_description, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = true, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = false, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.btn_cancel, + torBootstrapButton2ShouldOpenSettings = false, + wordmarkLogoVisible = false, + ), + LocationError( + progressBarVisible = true, + progress = 100, + progressTintColorResource = R.color.warning_yellow, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.browser_location, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_location_error_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_location_error_learn_more_link, + internetErrorDescription = R.string.connection_assist_location_error_description, + internetErrorDescription1 = R.string.connection_assist_find_bridge_location_description, + internetErrorDescription2 = R.string.connection_assist_select_country_try_again, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = true, + countryDropDownVisible = true, + torBootstrapButton1Visible = true, + torBootstrapButton1TextStringResource = R.string.connection_assist_try_a_bridge_button, + torBootstrapButton1ShouldShowTryingABridge = true, + torBootstrapButton2Visible = false, + torBootstrapButton2TextStringResource = null, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ), + LocationCheck( + progressBarVisible = true, + progress = 100, + progressTintColorResource = R.color.warning_yellow, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.browser_location, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_location_check_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_location_error_learn_more_link, + internetErrorDescription = R.string.connection_assist_location_error_description, + internetErrorDescription1 = R.string.connection_assist_find_bridge_location_description, + internetErrorDescription2 = R.string.connection_assist_select_country_try_again, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = true, + countryDropDownVisible = true, + torBootstrapButton1Visible = true, + torBootstrapButton1TextStringResource = R.string.connection_assist_try_a_bridge_button, + torBootstrapButton1ShouldShowTryingABridge = true, + torBootstrapButton2Visible = false, + torBootstrapButton2TextStringResource = null, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ), + LastTry( + progressBarVisible = true, + progress = 0, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_last_try_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_location_error_learn_more_link, + internetErrorDescription = R.string.connection_assist_location_error_description, + internetErrorDescription1 = R.string.connection_assist_find_bridge_location_description, + internetErrorDescription2 = R.string.connection_assist_select_country_try_again, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = true, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = false, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.btn_cancel, + torBootstrapButton2ShouldOpenSettings = false, + wordmarkLogoVisible = false, + ), + FinalError( + progressBarVisible = true, + progress = 100, + progressTintColorResource = R.color.warning_yellow, + backButtonVisible = true, + settingsButtonVisible = true, + torConnectImageVisible = true, + torConnectImageResource = R.drawable.connect_broken, + titleLargeTextViewVisible = true, + titleLargeTextViewTextStringResource = R.string.connection_assist_final_error_title, + titleDescriptionVisible = true, + learnMoreStringResource = R.string.connection_assist_final_error_learn_more_link, + internetErrorDescription = R.string.connection_assist_final_error_description1, + internetErrorDescription1 = R.string.connection_assist_final_error_troubleshoot_connection_link, + titleDescriptionTextStringResource = null, + quickstartSwitchVisible = false, + unblockTheInternetInCountryDescriptionVisible = false, + countryDropDownVisible = false, + torBootstrapButton1Visible = true, + torBootstrapButton1TextStringResource = R.string.connection_assist_internet_error_try_again, + torBootstrapButton2Visible = true, + torBootstrapButton2TextStringResource = R.string.connection_assist_configure_connection_button, + torBootstrapButton2ShouldOpenSettings = true, + wordmarkLogoVisible = false, + ) +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -24,27 +24,35 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import kotlinx.coroutines.launch +import mozilla.components.support.base.feature.UserInteractionHandler import org.mozilla.fenix.R import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding import org.mozilla.fenix.ext.hideToolbar -class TorConnectionAssistFragment : Fragment() { +class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { private val TAG = "TorConnectionAssistFrag" - private var _binding: FragmentTorConnectionAssistBinding? = null - private val binding get() = _binding!! - private val viewModel: TorConnectionAssistViewModel by viewModels() + private lateinit var binding: FragmentTorConnectionAssistBinding override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, ): View { - _binding = FragmentTorConnectionAssistBinding.inflate( + binding = FragmentTorConnectionAssistBinding.inflate( inflater, container, false, ) + viewLifecycleOwner.lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.torConnectScreen.collect { screen -> + Log.d(TAG, "torConnectScreen is $screen") + showScreen(screen) + } + } + } + return binding.root } @@ -56,23 +64,6 @@ class TorConnectionAssistFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.torConnectState.collect { torConnectState -> - Log.d(TAG, "torConnectState is ${torConnectState.state}") - when (torConnectState) { - TorConnectState.Initial -> showSplash() - TorConnectState.Configuring -> showConfiguring() - TorConnectState.AutoBootstrapping -> showBootstrapping() - TorConnectState.Bootstrapping -> showBootstrapping() - TorConnectState.Error -> showError() - TorConnectState.Bootstrapped -> openHome() - TorConnectState.Disabled -> openHome() - } - } - } - } - viewModel.progress().observe( viewLifecycleOwner, ) { progress -> @@ -88,243 +79,96 @@ class TorConnectionAssistFragment : Fragment() { ) { binding.quickstartSwitch.isChecked = it == true } - - binding.quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> - viewModel.handleQuickstartChecked(isChecked) - } } - - private fun showSplash() { - binding.torBootstrapProgressBar.visibility = View.GONE - binding.settingsButton.visibility = View.GONE - binding.backButton.visibility = View.GONE - binding.torConnectImage.visibility = View.GONE - binding.titleLargeTextView.visibility = View.GONE - binding.titleDescription.visibility = View.GONE - binding.quickstartSwitch.visibility = View.GONE - binding.torBootstrapButton1.visibility = View.GONE - binding.torBootstrapButton2.visibility = View.GONE - binding.wordmarkLogo.visibility = View.VISIBLE + override fun onDestroyView() { + super.onDestroyView() } + private fun showScreen(screen: ConnectAssistUiState) { + binding.apply { + torBootstrapProgressBar.visibility = if (screen.progressBarVisible) View.VISIBLE else View.GONE + torBootstrapProgressBar.progress = screen.progress + torBootstrapProgressBar.progressTintList = + screen.progressTintColorResource?.let { + AppCompatResources.getColorStateList(requireContext(), + it + ) + } - private fun showConfiguring() { - binding.wordmarkLogo.visibility = View.GONE - - binding.torBootstrapProgressBar.visibility = View.INVISIBLE - binding.torBootstrapProgressBar.progress = 0 - binding.backButton.visibility = View.INVISIBLE - binding.settingsButton.visibility = View.VISIBLE - binding.settingsButton.setOnClickListener { - viewModel.cancelTorBootstrap() - openSettings() - } - binding.torConnectImage.visibility = View.VISIBLE - binding.torConnectImage.setImageResource(R.drawable.connect) - binding.titleLargeTextView.visibility = View.VISIBLE - binding.titleLargeTextView.text = getString(R.string.connection_assist_tor_connect_title) - binding.titleDescription.visibility = View.VISIBLE - binding.titleDescription.text = - getString(R.string.preferences_tor_network_settings_explanation) - binding.quickstartSwitch.visibility = View.VISIBLE - binding.quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true - - binding.unblockTheInternetInCountryDescription.visibility = View.GONE - binding.countryDropDown.visibility = View.GONE + settingsButton.visibility = if (screen.settingsButtonVisible) View.VISIBLE else View.GONE + settingsButton.setOnClickListener { + viewModel.cancelTorBootstrap() + openSettings() + } - binding.torBootstrapButton1.visibility = View.VISIBLE - binding.torBootstrapButton1.text = getString(R.string.tor_bootstrap_connect) - binding.torBootstrapButton1.setOnClickListener { - viewModel.handleConnect(lifecycleScope = lifecycleScope) - showBootstrapping() - } + backButton.visibility = if (screen.backButtonVisible) View.VISIBLE else View.INVISIBLE + backButton.setOnClickListener { + viewModel.handleBackButtonPressed() + } - binding.torBootstrapButton2.visibility = View.VISIBLE - binding.torBootstrapButton2.text = - getString(R.string.connection_assist_configure_connection_button) - binding.torBootstrapButton2.setOnClickListener { - viewModel.cancelTorBootstrap() - openTorConnectionSettings() - } - } + torConnectImage.visibility = if (screen.torConnectImageVisible) View.VISIBLE else View.GONE + torConnectImage.setImageResource(screen.torConnectImageResource) + + titleLargeTextView.visibility = if (screen.titleLargeTextViewVisible) View.VISIBLE else View.GONE + titleLargeTextView.text = getString(screen.titleLargeTextViewTextStringResource) + titleDescription.visibility = if (screen.titleDescriptionVisible) View.VISIBLE else View.GONE + if (screen.learnMoreStringResource != null && screen.internetErrorDescription != null) { + val learnMore: String = getString(screen.learnMoreStringResource) + val internetErrorDescription: String = + if (screen.internetErrorDescription1 == null) { + getString( + screen.internetErrorDescription, + learnMore, + ) + } else if (screen.internetErrorDescription2 == null) { + getString( + screen.internetErrorDescription, + getString(screen.internetErrorDescription1), + learnMore, + ) + } else { + getString( + screen.internetErrorDescription, + getString(screen.internetErrorDescription1), + getString(screen.internetErrorDescription2), + learnMore, + ) + } + handleDescriptionWithClickable(internetErrorDescription, learnMore) + } else if (screen.titleDescriptionTextStringResource != null) { + titleDescription.text = getString(screen.titleDescriptionTextStringResource) + } + quickstartSwitch.visibility = if (screen.quickstartSwitchVisible) View.VISIBLE else View.GONE + quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true + quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> + viewModel.handleQuickstartChecked(isChecked) + } - private fun showBootstrapping() { - binding.wordmarkLogo.visibility = View.GONE + unblockTheInternetInCountryDescription.visibility = if (screen.unblockTheInternetInCountryDescriptionVisible) View.VISIBLE else View.GONE + countryDropDown.visibility = if (screen.countryDropDownVisible) View.VISIBLE else View.GONE - binding.torBootstrapProgressBar.visibility = View.VISIBLE - binding.torBootstrapProgressBar.progress = 0 - binding.backButton.visibility = View.INVISIBLE - binding.settingsButton.visibility = View.VISIBLE - binding.settingsButton.setOnClickListener { - viewModel.cancelTorBootstrap() - openSettings() - } - binding.torConnectImage.visibility = View.VISIBLE - binding.torConnectImage.setImageResource(R.drawable.connect) - binding.titleLargeTextView.visibility = View.VISIBLE - binding.titleLargeTextView.text = getString(R.string.connection_assist_connecting_title) - binding.titleDescription.visibility = View.VISIBLE - binding.titleDescription.text = - getString(R.string.preferences_tor_network_settings_explanation) - binding.quickstartSwitch.visibility = View.VISIBLE - binding.quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true - binding.quickstartSwitch.jumpDrawablesToCurrentState() - binding.torBootstrapButton1.visibility = View.INVISIBLE - binding.torBootstrapButton2.visibility = View.VISIBLE - binding.torBootstrapButton2.text = getString(R.string.btn_cancel) - binding.torBootstrapButton2.setOnClickListener { viewModel.cancelTorBootstrap() } - } + torBootstrapButton1.visibility = if (screen.torBootstrapButton1Visible) View.VISIBLE else View.GONE + torBootstrapButton1.text = getString(screen.torBootstrapButton1TextStringResource) + torBootstrapButton1.setOnClickListener { viewModel.handleButton1Pressed(screen, lifecycleScope) } - private suspend fun showError() { - viewModel.torError.collect { - Log.d( - TAG, - "TorError: details = ${it?.details ?: "null details"}, message = ${it?.message ?: "null message"}", - ) - when (viewModel.handleError(it)) { - ErrorScreen.CantConnectToInternet -> showCantConnectToInternet() - ErrorScreen.CantConnectToTorDirectly -> showCantConnectToTorDirectly() - ErrorScreen.WeCouldntFindYourLocation -> showWeCouldntFindYourLocation() - ErrorScreen.WereStillHavingTroubleConnecting -> showWereStillHavingTroubleConnecting() - ErrorScreen.WeWerentAbleToConnectAutomatically -> showWeWerentAbleToConnectAutomatically() - null -> { - // no op - Log.d(TAG, "ErrorScreen: null, nothing shown") + torBootstrapButton2.visibility = if (screen.torBootstrapButton2Visible) View.VISIBLE else View.GONE + torBootstrapButton2.text = screen.torBootstrapButton2TextStringResource?.let { + getString( + it + ) + } + torBootstrapButton2.setOnClickListener { + viewModel.cancelTorBootstrap() + if (screen.torBootstrapButton2ShouldOpenSettings){ + openTorConnectionSettings() + } else { + showScreen(ConnectAssistUiState.Configuring) } } - } - } - - private fun showCantConnectToInternet() { - Log.d(TAG, "showCantConnectToInternet()") - binding.torBootstrapProgressBar.visibility = View.VISIBLE - binding.torBootstrapProgressBar.progressTintList = - AppCompatResources.getColorStateList(requireContext(), R.color.warning_yellow) - binding.torBootstrapProgressBar.progress = 100 - - binding.backButton.visibility = View.VISIBLE - binding.backButton.setOnClickListener { - showConfiguring() - } - - binding.torConnectImage.setImageResource(R.drawable.globe_broken) - binding.titleLargeTextView.text = getString(R.string.connection_assist_internet_error_title) - val learnMore: String = getString(R.string.connection_assist_internet_error_learn_more) - val internetErrorDescription: String = getString( - R.string.connection_assist_internet_error_description, - learnMore, - ) - handleDescriptionWithClickable(internetErrorDescription, learnMore) - - binding.quickstartSwitch.visibility = View.GONE - - binding.torBootstrapButton1.visibility = View.VISIBLE - binding.torBootstrapButton1.text = - getString(R.string.connection_assist_internet_error_try_again) - binding.torBootstrapButton1.setOnClickListener { - showTryingAgain() - viewModel.handleConnect(lifecycleScope = lifecycleScope) - } - - binding.torBootstrapButton2.text = - getString(R.string.connection_assist_configure_connection_button) - binding.torBootstrapButton2.setOnClickListener { - openTorConnectionSettings() - } - } - - private fun showTryingAgain() { - Log.d(TAG, "showTryingAgain()") - binding.torBootstrapProgressBar.progress = 0 - binding.torBootstrapProgressBar.visibility = View.VISIBLE - binding.torBootstrapProgressBar.progressTintList = null - binding.torConnectImage.setImageResource(R.drawable.connect) - binding.titleLargeTextView.text = - getString(R.string.connection_assist_trying_again_waiting_title) - - binding.quickstartSwitch.visibility = View.GONE - binding.torBootstrapButton1.visibility = View.INVISIBLE - binding.torBootstrapButton2.visibility = View.VISIBLE - binding.torBootstrapButton2.text = getString(R.string.btn_cancel) - binding.torBootstrapButton2.setOnClickListener { - viewModel.cancelTorBootstrap() - showConfiguring() - } - } - - private fun showCantConnectToTorDirectly() { - Log.d(TAG, "showCantConnectToTorDirectly()") - binding.torBootstrapProgressBar.visibility = View.VISIBLE - binding.torBootstrapProgressBar.progressTintList = - AppCompatResources.getColorStateList(requireContext(), R.color.warning_yellow) - binding.torBootstrapProgressBar.progress = 100 - - binding.backButton.visibility = View.VISIBLE - binding.backButton.setOnClickListener { - showConfiguring() - } - - binding.torConnectImage.setImageResource(R.drawable.globe_broken) - binding.titleLargeTextView.text = - getString(R.string.connection_assist_cant_connect_to_tor_title) - - val learnMore: String = getString(R.string.connection_assist_internet_error_learn_more) - val tryABridge: String = getString( - R.string.connection_assist_try_a_bridge_description, - learnMore, - ) - handleDescriptionWithClickable(tryABridge, learnMore) - - binding.quickstartSwitch.visibility = View.GONE - binding.unblockTheInternetInCountryDescription.visibility = View.VISIBLE - binding.countryDropDown.visibility = View.VISIBLE - // TODO implement countryDropDown - - binding.torBootstrapButton1.visibility = View.VISIBLE - binding.torBootstrapButton1.text = getString(R.string.connection_assist_try_a_bridge_button) - binding.torBootstrapButton1.setOnClickListener { - viewModel.tryABridge() - showTryingABridge() + wordmarkLogo.visibility = if(screen.wordmarkLogoVisible) View.VISIBLE else View.GONE } - binding.torBootstrapButton2.visibility = View.GONE - } - - private fun showTryingABridge() { - Log.d(TAG, "showTryingABridge()") - // TODO(Not implemented) - binding.torBootstrapButton2.setOnClickListener { - showTryingABridge() - } - } - - private fun showWeCouldntFindYourLocation() { - Log.d(TAG, "showWeCouldntFindYourLocation()") - // TODO(Not implemented) - binding.torBootstrapButton2.setOnClickListener { - showTryingABridge() - } - } - - private fun showWereStillHavingTroubleConnecting() { - Log.d(TAG, "showWereStillHavingTroubleConnecting()") - TODO("Not yet implemented") - } - - private fun showTryingOneMoreTime() { - Log.d(TAG, "showTryingOneMoreTime()") - TODO("Not yet implemented") - } - - private fun showWeWerentAbleToConnectAutomatically() { - Log.d(TAG, "showWeWerentAbleToConnectAutomatically()") - TODO("Not yet implemented") - } - - private fun showUnknownError() { - Log.d(TAG, "showUnknownError()") - TODO("Not yet implemented") } /** @@ -377,4 +221,9 @@ class TorConnectionAssistFragment : Fragment() { ), ) } + + override fun onBackPressed(): Boolean { + return viewModel.handleBackButtonPressed() + } + } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -23,11 +23,8 @@ class TorConnectionAssistViewModel( private val _torController: TorControllerGV = components.torController as TorControllerGV - private val _torConnectState = MutableStateFlow(TorConnectState.Initial) - internal val torConnectState: StateFlow<TorConnectState> = _torConnectState - - private val _torError = MutableStateFlow(_torController.getLastErrorState()) - internal val torError: StateFlow<TorError?> = _torError + private val _torConnectScreen = MutableStateFlow(ConnectAssistUiState.Splash) + internal val torConnectScreen: StateFlow<ConnectAssistUiState> = _torConnectScreen private val _progress = MutableLiveData(0) fun progress(): LiveData<Int> { @@ -45,7 +42,7 @@ class TorConnectionAssistViewModel( _torController.registerTorListener(this) } - fun handleConnect( + private fun handleConnect( withDebugLogging: Boolean = false, lifecycleScope: LifecycleCoroutineScope? = null, ) { @@ -61,6 +58,17 @@ class TorConnectionAssistViewModel( _quickStartToggle.value = checked } + fun handleButton1Pressed( + screen: ConnectAssistUiState, + lifecycleScope: LifecycleCoroutineScope?, + ) { + if (screen.torBootstrapButton1ShouldShowTryingABridge) { + tryABridge() + } else { + handleConnect(lifecycleScope = lifecycleScope) + } + } + fun cancelTorBootstrap() { _torController.stopTor() _torController.setTorStopped() @@ -80,33 +88,126 @@ class TorConnectionAssistViewModel( if (progress != null) { _progress.value = progress.toInt() } - _torConnectState.value = _torController.lastKnownStatus - _torError.value = _torController.getLastErrorState() + + when (_torController.lastKnownStatus) { + TorConnectState.Initial -> _torConnectScreen.value = ConnectAssistUiState.Splash + TorConnectState.Configuring -> handleConfiguring() + TorConnectState.AutoBootstrapping -> handleBootstrap() + TorConnectState.Bootstrapping -> handleBootstrap() + TorConnectState.Error -> handleError() + else -> {} + } + } + + private fun handleConfiguring() { + if (_torController.lastKnownError == null) { + _torConnectScreen.value = ConnectAssistUiState.Configuring + } else { + handleError() + } + } + + private fun handleBootstrap() { + when (_torConnectScreen.value) { + ConnectAssistUiState.InternetError -> { + _torConnectScreen.value = ConnectAssistUiState.TryingAgain + } + + ConnectAssistUiState.TryingAgain -> { + /** stay here */ + } + + ConnectAssistUiState.TryABridge -> { + _torConnectScreen.value = ConnectAssistUiState.TryingABridge + } + + ConnectAssistUiState.LocationError -> { + _torConnectScreen.value = ConnectAssistUiState.TryingABridge + } + + ConnectAssistUiState.TryingABridge -> { + /** stay here */ + } + + ConnectAssistUiState.LocationCheck -> { + _torConnectScreen.value = ConnectAssistUiState.LastTry + } + + ConnectAssistUiState.LastTry -> { + /** stay here */ + } + + else -> _torConnectScreen.value = ConnectAssistUiState.Bootstrapping + } + } + + private fun handleError() { + _torController.lastKnownError?.apply { + Log.d( + TAG, + "TorError(message = $message, details = $details, phase = $phase, reason = $reason", + ) + // TODO better error handling + _torConnectScreen.value = ConnectAssistUiState.InternetError + } } override fun onTorStopped() { Log.d(TAG, "onTorStopped()") } - internal fun handleError(it: TorError?): ErrorScreen? { - // TODO(Only partly implemented) - if (it?.message == null){ - return null + private fun tryABridge() { + if (!_torController.bridgesEnabled) { + _torController.bridgesEnabled = true + _torController.bridgeTransport = + TorBridgeTransportConfig.BUILTIN_OBFS4 // TODO select based on country } - return ErrorScreen.CantConnectToInternet + handleConnect(withDebugLogging = true) } - fun tryABridge() { - // TODO("Try a bridge not enabled") - // connect to bridge based on country - // try connecting + fun handleBackButtonPressed(): Boolean { + when (torConnectScreen.value) { + ConnectAssistUiState.Splash -> return false + ConnectAssistUiState.Configuring -> return false + ConnectAssistUiState.Bootstrapping -> cancelTorBootstrap() + ConnectAssistUiState.InternetError -> { + _torController.lastKnownError = null + _torConnectScreen.value = ConnectAssistUiState.Configuring + } + + ConnectAssistUiState.TryingAgain -> { + cancelTorBootstrap() + } + + ConnectAssistUiState.TryABridge -> { + _torController.lastKnownError = null + _torConnectScreen.value = ConnectAssistUiState.Configuring + } + + ConnectAssistUiState.TryingABridge -> { + _torController.stopTor() + _torConnectScreen.value = ConnectAssistUiState.TryABridge + } + + ConnectAssistUiState.LocationError -> { + _torConnectScreen.value = ConnectAssistUiState.TryABridge + } + + ConnectAssistUiState.LocationCheck -> { + _torConnectScreen.value = ConnectAssistUiState.LocationError + } + + ConnectAssistUiState.LastTry -> { + _torController.stopTor() + _torConnectScreen.value = ConnectAssistUiState.LocationCheck + } + + ConnectAssistUiState.FinalError -> { + _torConnectScreen.value = ConnectAssistUiState.LocationCheck + } + } + return true } -} -internal enum class ErrorScreen { - CantConnectToInternet, - CantConnectToTorDirectly, - WeCouldntFindYourLocation, - WereStillHavingTroubleConnecting, - WeWerentAbleToConnectAutomatically, } + ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -285,7 +285,7 @@ class TorControllerGV( // TorEventsBootstrapStateChangeListener override fun onBootstrapStateChange(newStateVal: String?) { - Log.d(TAG, "onBootstrapStateChange($newStateVal)") + Log.d(TAG, "onBootstrapStateChange(newStateVal = $newStateVal)") val newState: TorConnectState = TorConnectState.valueOf(newStateVal ?: "Error") if (newState.isError() && wasTorBootstrapped) { ===================================== fenix/app/src/main/res/drawable/browser_location.xml ===================================== @@ -0,0 +1,17 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="40dp" + android:height="40dp" + android:viewportWidth="40" + android:viewportHeight="40"> + <group> + <clip-path + android:pathData="M0,0h40v40h-40z"/> + <path + android:pathData="M19.332,28.605C19.332,23.853 23.361,20 28.332,20C33.303,20 37.332,23.853 37.332,28.605C37.332,32.002 32.736,36.822 30.113,39.296C29.636,39.748 28.997,40 28.332,40C27.667,40 27.028,39.748 26.551,39.296C23.928,36.822 19.332,32.001 19.332,28.605ZM26.865,24.958C27.33,24.766 27.829,24.667 28.332,24.667C29.349,24.667 30.324,25.07 31.043,25.789C31.761,26.508 32.165,27.483 32.165,28.5C32.165,29.517 31.761,30.492 31.043,31.211C30.324,31.93 29.349,32.333 28.332,32.333C27.829,32.333 27.33,32.234 26.865,32.042C26.4,31.849 25.977,31.566 25.621,31.211C25.265,30.855 24.983,30.432 24.791,29.967C24.598,29.502 24.499,29.003 24.499,28.5C24.499,27.997 24.598,27.498 24.791,27.033C24.983,26.568 25.265,26.146 25.621,25.789C25.977,25.434 26.4,25.151 26.865,24.958Z" + android:fillColor="#FFA436" + android:fillType="evenOdd"/> + <path + android:pathData="M38.509,22.9C38.721,21.771 38.832,20.607 38.832,19.417C38.832,9.061 30.438,0.667 20.082,0.667C9.727,0.667 1.332,9.061 1.332,19.417C1.332,29.772 9.727,38.167 20.082,38.167C20.825,38.167 21.559,38.124 22.279,38.039C19.438,34.942 16.665,31.167 16.665,28.233C16.665,25.223 17.971,22.499 20.082,20.526V14.846C22.098,14.846 23.809,16.151 24.416,17.962C25.33,17.658 26.298,17.458 27.301,17.375C26.412,14.225 23.517,11.917 20.082,11.917L20.082,9.221C25.042,9.221 29.175,12.764 30.089,17.456C31.169,17.608 32.2,17.899 33.161,18.308C32.598,11.578 26.957,6.292 20.082,6.292V3.596C28.819,3.596 35.903,10.679 35.903,19.417C35.903,19.589 35.9,19.761 35.894,19.933C36.942,20.767 37.83,21.771 38.509,22.9Z" + android:fillColor="#FBFBFE"/> + </group> +</vector> ===================================== fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -3,7 +3,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/tor_bootstrap_background_gradient" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/4d8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/4d8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40076
by boklm (＠boklm) 01 May '24

01 May '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 97043406 by Nicolas Vigier at 2024-05-01T10:10:41+02:00 Update rbm for rbm#40076 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 05e32169dfad9f3cc3eb6aa3f93d9b7a1690290e +Subproject commit 148d8541f177f318bfd8c8abfbf9fa96f581ceb8 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- This project does not include diff previews in email notifications. 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-115.10.0esr-13.5-1] 8 commits: fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard (＠richard) 30 Apr '24

30 Apr '24

richard pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 795b62a7 by Henry Wilkes at 2024-04-25T10:32:13+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Remove the OnionServicesAuthPrompt class. The class is merged into OnionAuthPrompt. This currently only works when only one tab triggers the prompt at a time. Not linted to improve commit readability. - - - - - 38d07333 by Henry Wilkes at 2024-04-25T10:32:14+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Lint after removing OnionServicesAuthPrompt class. - - - - - a35c7a68 by Henry Wilkes at 2024-04-25T11:55:07+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Re-handle showing errors. Call "_showWarning" rather than "show" when we have an error. Do not attempt to show the prompt if we cannot determine the onion service id. For the service id regex, use "^(.*\.)?" instead of "^(.*\.)*": since the ".*" is greedy, this can only ever match up to once. - - - - - df3374c4 by Henry Wilkes at 2024-04-30T11:11:39+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Reset the authentication prompt when switching between two authentication tabs. We keep a record of which tab details are being shown in the notification popup. We reset the prompt whenever we want to show different details. We also fetch elements and set event listeners (once) when we initialize OnionAuthPrompt. In particular, the listeners should only react to the shown details. We also assume that elements with an ID exist in the DOM. - - - - - 0cacad0c by Henry Wilkes at 2024-04-30T11:11:46+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Follow recent coding conventions. Do not prefix variable names with "a" and use triple equality. - - - - - 82fa0a97 by Henry Wilkes at 2024-04-30T11:11:46+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Use "keydown" instead of deprecated "keypress". Also, stop handling "Escape" key since it is already handled by PopupNotification. - - - - - 78107767 by Henry Wilkes at 2024-04-30T11:11:47+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Add documentation to OnionAuthPrompt. - - - - - 170cb7ab by Henry Wilkes at 2024-04-30T11:11:47+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42542: Add a logger to OnionAuthPrompt. - - - - - 2 changed files: - browser/components/onionservices/content/authPopup.inc.xhtml - browser/components/onionservices/content/authPrompt.js Changes: ===================================== browser/components/onionservices/content/authPopup.inc.xhtml ===================================== @@ -5,7 +5,9 @@ <description id="tor-clientauth-notification-desc"/> <label id="tor-clientauth-notification-learnmore" class="text-link popup-notification-learnmore-link" - is="text-link"/> + is="text-link" + href="about:manual#onion-services_onion-service-authentication" + useoriginprincipal="true"/> <html:div> <html:input id="tor-clientauth-notification-key" type="password"/> <html:div id="tor-clientauth-warning"/> ===================================== browser/components/onionservices/content/authPrompt.js ===================================== @@ -2,350 +2,417 @@ "use strict"; -const OnionAuthPrompt = (function () { +var OnionAuthPrompt = { // Only import to our internal scope, rather than the global scope of // browser.xhtml. - const lazy = {}; - ChromeUtils.defineESModuleGetters(lazy, { - TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", - TorStrings: "resource://gre/modules/TorStrings.sys.mjs", - CommonUtils: "resource://services-common/utils.sys.mjs", - }); - - // OnionServicesAuthPrompt objects run within the main/chrome process. - // aReason is the topic passed within the observer notification that is - // causing this auth prompt to be displayed. - function OnionServicesAuthPrompt(aBrowser, aFailedURI, aReason, aOnionName) { - this._browser = aBrowser; - this._failedURI = aFailedURI; - this._reasonForPrompt = aReason; - this._onionHostname = aOnionName; - } - - const topics = { + _lazy: {}, + + /** + * The topics to listen to. + * + * @type {Object<string, string>} + */ + _topics: { clientAuthMissing: "tor-onion-services-clientauth-missing", clientAuthIncorrect: "tor-onion-services-clientauth-incorrect", - }; - - OnionServicesAuthPrompt.prototype = { - show(aWarningMessage) { - let mainAction = { - label: lazy.TorStrings.onionServices.authPrompt.done, - accessKey: lazy.TorStrings.onionServices.authPrompt.doneAccessKey, - leaveOpen: true, // Callback is responsible for closing the notification. - callback: this._onDone.bind(this), - }; - - let dialogBundle = Services.strings.createBundle( - "chrome://global/locale/dialog.properties" - ); - - let cancelAccessKey = dialogBundle.GetStringFromName("accesskey-cancel"); - if (!cancelAccessKey) { - cancelAccessKey = "c"; - } // required by PopupNotifications.show() - - let cancelAction = { - label: dialogBundle.GetStringFromName("button-cancel"), - accessKey: cancelAccessKey, - callback: this._onCancel.bind(this), - }; - - let _this = this; - let options = { - autofocus: true, - hideClose: true, - persistent: true, - removeOnDismissal: false, - eventCallback(aTopic) { - if (aTopic === "showing") { - _this._onPromptShowing(aWarningMessage); - } else if (aTopic === "shown") { - _this._onPromptShown(); - } else if (aTopic === "removed") { - _this._onPromptRemoved(); - } - }, - }; - - this._prompt = PopupNotifications.show( - this._browser, - "tor-clientauth", - "", - "tor-clientauth-notification-icon", - mainAction, - [cancelAction], - options - ); - }, - - _onPromptShowing(aWarningMessage) { - let xulDoc = this._browser.ownerDocument; - let descElem = xulDoc.getElementById("tor-clientauth-notification-desc"); - if (descElem) { - // Handle replacement of the onion name within the localized - // string ourselves so we can show the onion name as bold text. - // We do this by splitting the localized string and creating - // several HTML <span> elements. - const fmtString = lazy.TorStrings.onionServices.authPrompt.description; - const [prefix, suffix] = fmtString.split("%S"); - - const domainEl = xulDoc.createElement("span"); - domainEl.id = "tor-clientauth-notification-onionname"; - domainEl.textContent = TorUIUtils.shortenOnionAddress( - this._onionHostname - ); - - descElem.replaceChildren(prefix, domainEl, suffix); - } - - // Set "Learn More" label and href. - let learnMoreElem = xulDoc.getElementById( - "tor-clientauth-notification-learnmore" - ); - if (learnMoreElem) { - learnMoreElem.setAttribute( - "value", - lazy.TorStrings.onionServices.learnMore - ); - learnMoreElem.setAttribute( - "href", - "about:manual#onion-services_onion-service-authentication" - ); - learnMoreElem.setAttribute("useoriginprincipal", "true"); - } - - this._showWarning(aWarningMessage); - let checkboxElem = this._getCheckboxElement(); - if (checkboxElem) { - checkboxElem.checked = false; - } - }, - - _onPromptShown() { - let keyElem = this._getKeyElement(); - if (keyElem) { - keyElem.setAttribute( - "placeholder", - lazy.TorStrings.onionServices.authPrompt.keyPlaceholder - ); - this._boundOnKeyFieldKeyPress = this._onKeyFieldKeyPress.bind(this); - this._boundOnKeyFieldInput = this._onKeyFieldInput.bind(this); - keyElem.addEventListener("keypress", this._boundOnKeyFieldKeyPress); - keyElem.addEventListener("input", this._boundOnKeyFieldInput); - keyElem.focus(); - } - }, - - _onPromptRemoved() { - if (this._boundOnKeyFieldKeyPress) { - let keyElem = this._getKeyElement(); - if (keyElem) { - keyElem.value = ""; - keyElem.removeEventListener( - "keypress", - this._boundOnKeyFieldKeyPress - ); - this._boundOnKeyFieldKeyPress = undefined; - keyElem.removeEventListener("input", this._boundOnKeyFieldInput); - this._boundOnKeyFieldInput = undefined; + }, + + /** + * @typedef {object} PromptDetails + * + * @property {Browser} browser - The browser this prompt is for. + * @property {string} cause - The notification that cause this prompt. + * @property {string} onionHost - The onion host name. + * @property {nsIURI} uri - The browser URI when the notification was + * triggered. + * @property {string} onionServiceId - The onion service ID for this host. + * @property {Notification} [notification] - The notification instance for + * this prompt. + */ + + /** + * The currently shown details in the prompt. + */ + _shownDetails: null, + + /** + * Used for logging to represent PromptDetails. + * + * @param {PromptDetails} details - The details to represent. + * @returns {string} - The representation of these details. + */ + _detailsRepr(details) { + if (!details) { + return "none"; + } + return `${details.browser.browserId}:${details.onionHost}`; + }, + + /** + * Show a new prompt, using the given details. + * + * @param {PromptDetails} details - The details to show. + */ + show(details) { + this._logger.debug(`New Notification: ${this._detailsRepr(details)}`); + + let mainAction = { + label: this.TorStrings.onionServices.authPrompt.done, + accessKey: this.TorStrings.onionServices.authPrompt.doneAccessKey, + leaveOpen: true, // Callback is responsible for closing the notification. + callback: this._onDone.bind(this), + }; + + let dialogBundle = Services.strings.createBundle( + "chrome://global/locale/dialog.properties" + ); + + let cancelAccessKey = dialogBundle.GetStringFromName("accesskey-cancel"); + if (!cancelAccessKey) { + cancelAccessKey = "c"; + } // required by PopupNotifications.show() + + // The first secondarybuttoncommand (cancelAction) should be triggered when + // the user presses "Escape". + let cancelAction = { + label: dialogBundle.GetStringFromName("button-cancel"), + accessKey: cancelAccessKey, + callback: this._onCancel.bind(this), + }; + + let options = { + autofocus: true, + hideClose: true, + persistent: true, + removeOnDismissal: false, + eventCallback: topic => { + if (topic === "showing") { + this._onPromptShowing(details); + } else if (topic === "shown") { + this._onPromptShown(); + } else if (topic === "removed") { + this._onPromptRemoved(details); } + }, + }; + + details.notification = PopupNotifications.show( + details.browser, + "tor-clientauth", + "", + "tor-clientauth-notification-icon", + mainAction, + [cancelAction], + options + ); + }, + + /** + * Callback when the prompt is about to be shown. + * + * @param {PromptDetails?} details - The details to show, or null to shown + * none. + */ + _onPromptShowing(details) { + if (details === this._shownDetails) { + // The last shown details match this one exactly. + // This happens when we switch tabs to a page that has no prompt and then + // switch back. + // We don't want to reset the current state in this case. + // In particular, we keep the current _keyInput value and _persistCheckbox + // the same. + this._logger.debug(`Already showing: ${this._detailsRepr(details)}`); + return; + } + + this._logger.debug(`Now showing: ${this._detailsRepr(details)}`); + + this._shownDetails = details; + + // Clear the key input. + // In particular, clear the input when switching tabs. + this._keyInput.value = ""; + this._persistCheckbox.checked = false; + + // Handle replacement of the onion name within the localized + // string ourselves so we can show the onion name as bold text. + // We do this by splitting the localized string and creating + // several HTML <span> elements. + const fmtString = this.TorStrings.onionServices.authPrompt.description; + const [prefix, suffix] = fmtString.split("%S"); + + const domainEl = document.createElement("span"); + domainEl.id = "tor-clientauth-notification-onionname"; + domainEl.textContent = TorUIUtils.shortenOnionAddress( + this._shownDetails?.onionHost ?? "" + ); + + this._descriptionEl.replaceChildren(prefix, domainEl, suffix); + + this._showWarning(undefined); + }, + + /** + * Callback after the prompt is shown. + */ + _onPromptShown() { + this._keyInput.focus(); + }, + + /** + * Callback when a Notification is removed. + * + * @param {PromptDetails} details - The details for the removed notification. + */ + _onPromptRemoved(details) { + if (details !== this._shownDetails) { + // Removing the notification for some other page. + // For example, closing another tab that also requires authentication. + this._logger.debug(`Removed not shown: ${this._detailsRepr(details)}`); + return; + } + this._logger.debug(`Removed shown: ${this._detailsRepr(details)}`); + // Reset the prompt as a precaution. + // In particular, we want to clear the input so that the entered key does + // not persist. + this._onPromptShowing(null); + }, + + /** + * Callback when the user submits the key. + */ + async _onDone() { + this._logger.debug( + `Sumbitting key: ${this._detailsRepr(this._shownDetails)}` + ); + + // Grab the details before they might change as we await. + const { browser, onionServiceId, notification } = this._shownDetails; + const isPermanent = this._persistCheckbox.checked; + + const base64key = this._keyToBase64(this._keyInput.value); + if (!base64key) { + this._showWarning(this.TorStrings.onionServices.authPrompt.invalidKey); + return; + } + + try { + const provider = await this._lazy.TorProviderBuilder.build(); + await provider.onionAuthAdd(onionServiceId, base64key, isPermanent); + } catch (e) { + if (e.torMessage) { + this._showWarning(e.torMessage); + } else { + this._logger.error(`Failed to set key for ${onionServiceId}`, e); + this._showWarning( + this.TorStrings.onionServices.authPrompt.failedToSetKey + ); } - }, - - _onKeyFieldKeyPress(aEvent) { - if (aEvent.keyCode == aEvent.DOM_VK_RETURN) { - this._onDone(); - } else if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) { - this._prompt.remove(); - this._onCancel(); - } - }, - - _onKeyFieldInput(aEvent) { - this._showWarning(undefined); // Remove the warning. - }, - - async _onDone() { - const keyElem = this._getKeyElement(); - if (!keyElem) { - return; - } - - const base64key = this._keyToBase64(keyElem.value); - if (!base64key) { - this._showWarning(lazy.TorStrings.onionServices.authPrompt.invalidKey); - return; - } - - this._prompt.remove(); - - const controllerFailureMsg = - lazy.TorStrings.onionServices.authPrompt.failedToSetKey; + return; + } + + notification.remove(); + // Success! Reload the page. + browser.sendMessageToActor("Browser:Reload", {}, "BrowserTab"); + }, + + /** + * Callback when the user dismisses the prompt. + */ + _onCancel() { + // Arrange for an error page to be displayed: + // we build a short script calling docShell.displayError() + // and we pass it as a data: URI to loadFrameScript(), + // which runs it in the content frame which triggered + // this authentication prompt. + this._logger.debug(`Cancelling: ${this._detailsRepr(this._shownDetails)}`); + + const { browser, cause, uri } = this._shownDetails; + const errorCode = + cause === this._topics.clientAuthMissing + ? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH + : Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; + const io = + 'ChromeUtils.import("resource://gre/modules/Services.jsm").Services.io'; + + browser.messageManager.loadFrameScript( + `data:application/javascript,${encodeURIComponent( + `docShell.displayLoadError(${errorCode}, ${io}.newURI(${JSON.stringify( + uri.spec + )}), undefined, undefined);` + )}`, + false + ); + }, + + /** + * Show a warning message to the user or clear the warning. + * + * @param {string?} warningMessage - The message to show, or undefined to + * clear the current message. + */ + _showWarning(warningMessage) { + this._logger.debug(`Showing warning: ${warningMessage}`); + if (warningMessage) { + this._warningEl.textContent = warningMessage; + this._warningEl.removeAttribute("hidden"); + this._keyInput.classList.add("invalid"); + } else { + this._warningEl.setAttribute("hidden", "true"); + this._keyInput.classList.remove("invalid"); + } + }, + + /** + * Convert the user-entered key into base64. + * + * @param {string} keyString - The key to convert. + * @returns {string?} - The base64 representation, or undefined if the given + * key was not the correct format. + */ + _keyToBase64(keyString) { + if (!keyString) { + return undefined; + } + + let base64key; + if (keyString.length === 52) { + // The key is probably base32-encoded. Attempt to decode. + // Although base32 specifies uppercase letters, we accept lowercase + // as well because users may type in lowercase or copy a key out of + // a tor onion-auth file (which uses lowercase). + let rawKey; try { - // ^(subdomain.)*onionserviceid.onion$ (case-insensitive) - const onionServiceIdRegExp = - /^(.*\.)*(?<onionServiceId>[a-z2-7]{56})\.onion$/i; - // match() will return null on bad match, causing throw - const onionServiceId = this._onionHostname - .match(onionServiceIdRegExp) - .groups.onionServiceId.toLowerCase(); - - const checkboxElem = this._getCheckboxElement(); - const isPermanent = checkboxElem && checkboxElem.checked; - const provider = await lazy.TorProviderBuilder.build(); - await provider.onionAuthAdd(onionServiceId, base64key, isPermanent); - // Success! Reload the page. - this._browser.sendMessageToActor("Browser:Reload", {}, "BrowserTab"); - } catch (e) { - if (e.torMessage) { - this.show(e.torMessage); - } else { - console.error(controllerFailureMsg, e); - this.show(controllerFailureMsg); - } - } - }, - - _onCancel() { - // Arrange for an error page to be displayed: - // we build a short script calling docShell.displayError() - // and we pass it as a data: URI to loadFrameScript(), - // which runs it in the content frame which triggered - // this authentication prompt. - const failedURI = this._failedURI.spec; - const errorCode = - this._reasonForPrompt === topics.clientAuthMissing - ? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH - : Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; - const io = - 'ChromeUtils.import("resource://gre/modules/Services.jsm").Services.io'; - - this._browser.messageManager.loadFrameScript( - `data:application/javascript,${encodeURIComponent( - `docShell.displayLoadError(${errorCode}, ${io}.newURI(${JSON.stringify( - failedURI - )}), undefined, undefined);` - )}`, - false - ); - }, - - _getKeyElement() { - let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById("tor-clientauth-notification-key"); - }, - - _getCheckboxElement() { - let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById("tor-clientauth-persistkey-checkbox"); - }, - - _showWarning(aWarningMessage) { - let xulDoc = this._browser.ownerDocument; - let warningElem = xulDoc.getElementById("tor-clientauth-warning"); - let keyElem = this._getKeyElement(); - if (warningElem) { - if (aWarningMessage) { - warningElem.textContent = aWarningMessage; - warningElem.removeAttribute("hidden"); - if (keyElem) { - keyElem.className = "invalid"; - } - } else { - warningElem.setAttribute("hidden", "true"); - if (keyElem) { - keyElem.className = ""; - } - } - } - }, - - // Returns undefined if the key is the wrong length or format. - _keyToBase64(aKeyString) { - if (!aKeyString) { - return undefined; - } + rawKey = this._lazy.CommonUtils.decodeBase32(keyString.toUpperCase()); + } catch (e) {} - let base64key; - if (aKeyString.length == 52) { - // The key is probably base32-encoded. Attempt to decode. - // Although base32 specifies uppercase letters, we accept lowercase - // as well because users may type in lowercase or copy a key out of - // a tor onion-auth file (which uses lowercase). - let rawKey; + if (rawKey) { try { - rawKey = lazy.CommonUtils.decodeBase32(aKeyString.toUpperCase()); + base64key = btoa(rawKey); } catch (e) {} - - if (rawKey) { - try { - base64key = btoa(rawKey); - } catch (e) {} - } - } else if ( - aKeyString.length == 44 && - /^[a-zA-Z0-9+/]*=*$/.test(aKeyString) - ) { - // The key appears to be a correctly formatted base64 value. If not, - // tor will return an error when we try to add the key via the - // control port. - base64key = aKeyString; } - - return base64key; - }, - }; - - let retval = { - init() { - Services.obs.addObserver(this, topics.clientAuthMissing); - Services.obs.addObserver(this, topics.clientAuthIncorrect); - }, - - uninit() { - Services.obs.removeObserver(this, topics.clientAuthMissing); - Services.obs.removeObserver(this, topics.clientAuthIncorrect); - }, - - // aSubject is the DOM Window or browser where the prompt should be shown. - // aData contains the .onion name. - observe(aSubject, aTopic, aData) { - if ( - aTopic != topics.clientAuthMissing && - aTopic != topics.clientAuthIncorrect - ) { - return; - } - - let browser; - if (aSubject instanceof Ci.nsIDOMWindow) { - let contentWindow = aSubject.QueryInterface(Ci.nsIDOMWindow); - browser = contentWindow.docShell.chromeEventHandler; - } else { - browser = aSubject.QueryInterface(Ci.nsIBrowser); - } - - if (!gBrowser.browsers.some(aBrowser => aBrowser == browser)) { - return; // This window does not contain the subject browser; ignore. + } else if ( + keyString.length === 44 && + /^[a-zA-Z0-9+/]*=*$/.test(keyString) + ) { + // The key appears to be a correctly formatted base64 value. If not, + // tor will return an error when we try to add the key via the + // control port. + base64key = keyString; + } + + return base64key; + }, + + /** + * Initialize the authentication prompt. + */ + init() { + this._logger = console.createInstance({ + prefix: "OnionAuthPrompt", + maxLogLevel: "Warn", + maxLogLevelPref: "browser.onionAuthPrompt.loglevel", + }); + + const { TorStrings } = ChromeUtils.importESModule( + "resource://gre/modules/TorStrings.sys.mjs" + ); + this.TorStrings = TorStrings; + ChromeUtils.defineESModuleGetters(this._lazy, { + TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", + CommonUtils: "resource://services-common/utils.sys.mjs", + }); + + this._keyInput = document.getElementById("tor-clientauth-notification-key"); + this._persistCheckbox = document.getElementById( + "tor-clientauth-persistkey-checkbox" + ); + this._warningEl = document.getElementById("tor-clientauth-warning"); + this._descriptionEl = document.getElementById( + "tor-clientauth-notification-desc" + ); + + // Set "Learn More" label and href. + const learnMoreElem = document.getElementById( + "tor-clientauth-notification-learnmore" + ); + learnMoreElem.setAttribute( + "value", + this.TorStrings.onionServices.learnMore + ); + + this._keyInput.setAttribute( + "placeholder", + this.TorStrings.onionServices.authPrompt.keyPlaceholder + ); + this._keyInput.addEventListener("keydown", event => { + if (event.key === "Enter") { + event.preventDefault(); + this._onDone(); } - - let failedURI = browser.currentURI; - let authPrompt = new OnionServicesAuthPrompt( - browser, - failedURI, - aTopic, - aData + }); + this._keyInput.addEventListener("input", event => { + // Remove the warning. + this._showWarning(undefined); + }); + + Services.obs.addObserver(this, this._topics.clientAuthMissing); + Services.obs.addObserver(this, this._topics.clientAuthIncorrect); + }, + + /** + * Un-initialize the authentication prompt. + */ + uninit() { + Services.obs.removeObserver(this, this._topics.clientAuthMissing); + Services.obs.removeObserver(this, this._topics.clientAuthIncorrect); + }, + + observe(subject, topic, data) { + if ( + topic !== this._topics.clientAuthMissing && + topic !== this._topics.clientAuthIncorrect + ) { + return; + } + + // "subject" is the DOM window or browser where the prompt should be shown. + let browser; + if (subject instanceof Ci.nsIDOMWindow) { + let contentWindow = subject.QueryInterface(Ci.nsIDOMWindow); + browser = contentWindow.docShell.chromeEventHandler; + } else { + browser = subject.QueryInterface(Ci.nsIBrowser); + } + + if (!gBrowser.browsers.includes(browser)) { + // This window does not contain the subject browser. + this._logger.debug( + `Window ${window.docShell.outerWindowID}: Ignoring ${topic}` ); - authPrompt.show(undefined); - }, - }; - - return retval; -})(); /* OnionAuthPrompt */ - -Object.defineProperty(this, "OnionAuthPrompt", { - value: OnionAuthPrompt, - enumerable: true, - writable: false, -}); + return; + } + this._logger.debug( + `Window ${window.docShell.outerWindowID}: Handling ${topic}` + ); + + const onionHost = data; + // ^(subdomain.)*onionserviceid.onion$ (case-insensitive) + const onionServiceId = onionHost + .match(/^(.*\.)?(?<onionServiceId>[a-z2-7]{56})\.onion$/i) + ?.groups.onionServiceId.toLowerCase(); + if (!onionServiceId) { + this._logger.error(`Malformed onion address: ${onionHost}`); + return; + } + + const details = { + browser, + cause: topic, + onionHost, + uri: browser.currentURI, + onionServiceId, + }; + this.show(details); + }, +}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/29ff3f… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/29ff3f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40076: Take refresh_input into account when computing input_files_id
by richard (＠richard) 30 Apr '24

30 Apr '24

richard pushed to branch main at The Tor Project / Applications / RBM Commits: 148d8541 by Nicolas Vigier at 2024-04-25T14:54:32+02:00 Bug 40076: Take refresh_input into account when computing input_files_id The `refresh_input` option forces refreshing an input_file. The option is correctly taken into account when starting a build, but was not when computing `input_files_id`. - - - - - 1 changed file: - lib/RBM.pm Changes: ===================================== lib/RBM.pm ===================================== @@ -796,7 +796,7 @@ sub input_file_need_dl { return undef; } return undef if $input_file->{exec}; - return undef if $fname; + return undef if ($fname && !$t->('refresh_input')); return 1 if $input_file->{URL}; return 1 if $input_file->{content}; return undef; View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/148d8541f177f31… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/148d8541f177f31… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 13.5a7
by boklm (＠boklm) 29 Apr '24

29 Apr '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 54df007d by Nicolas Vigier at 2024-04-29T16:51:58+02:00 alpha: new version, 13.5a7 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.5a3-13.5a6-linux-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml - − update_3/alpha/13.5a3-13.5a6-macos-ALL.xml - − update_3/alpha/13.5a3-13.5a6-windows-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml - − update_3/alpha/13.5a4-13.5a6-linux-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml - − update_3/alpha/13.5a4-13.5a6-macos-ALL.xml - − update_3/alpha/13.5a4-13.5a6-windows-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a7-linux-i686-ALL.xml - + update_3/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a7-macos-ALL.xml - + update_3/alpha/13.5a4-13.5a7-windows-i686-ALL.xml - + update_3/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml - − update_3/alpha/13.5a5-13.5a6-linux-i686-ALL.xml - − update_3/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml - − update_3/alpha/13.5a5-13.5a6-macos-ALL.xml - − update_3/alpha/13.5a5-13.5a6-windows-i686-ALL.xml - − update_3/alpha/13.5a5-13.5a6-windows-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a7-linux-i686-ALL.xml - + update_3/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a7-macos-ALL.xml - + update_3/alpha/13.5a5-13.5a7-windows-i686-ALL.xml - + update_3/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml - + update_3/alpha/13.5a6-13.5a7-linux-i686-ALL.xml - + update_3/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml - + update_3/alpha/13.5a6-13.5a7-macos-ALL.xml - + update_3/alpha/13.5a6-13.5a7-windows-i686-ALL.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… -- This project does not include diff previews in email notifications. 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/mullvad-browser-update-responses][main] alpha: new version, 13.5a7
by boklm (＠boklm) 29 Apr '24

29 Apr '24

boklm pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: ac9f621a by Nicolas Vigier at 2024-04-29T15:33:08+02:00 alpha: new version, 13.5a7 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml - − update_1/alpha/13.5a3-13.5a6-macos-ALL.xml - − update_1/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml - − update_1/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml - − update_1/alpha/13.5a4-13.5a6-macos-ALL.xml - − update_1/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a7-macos-ALL.xml - + update_1/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml - − update_1/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml - − update_1/alpha/13.5a5-13.5a6-macos-ALL.xml - − update_1/alpha/13.5a5-13.5a6-windows-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a7-macos-ALL.xml - + update_1/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml - + update_1/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml - + update_1/alpha/13.5a6-13.5a7-macos-ALL.xml - + update_1/alpha/13.5a6-13.5a7-windows-x86_64-ALL.xml - − update_1/alpha/13.5a6-linux-x86_64-ALL.xml - − update_1/alpha/13.5a6-macos-ALL.xml - − update_1/alpha/13.5a6-windows-x86_64-ALL.xml - + update_1/alpha/13.5a7-linux-x86_64-ALL.xml - + update_1/alpha/13.5a7-macos-ALL.xml - + update_1/alpha/13.5a7-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.5a6/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5a6-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a3/ALL 13.5a3-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a5/ALL 13.5a5-13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a6-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5a6-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a3/ALL 13.5a3-13.5a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a5/ALL 13.5a5-13.5a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a6-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a6-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5a7/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5a7-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a6/ALL 13.5a6-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a5/ALL 13.5a5-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a6/ALL 13.5a6-13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a7-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5a7-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a5/ALL 13.5a5-13.5a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a6/ALL 13.5a6-13.5a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a7-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a7-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a3…" hashFunction="SHA512" hashValue="9e777fddfa0f657288f0390076bd6a43a37a87743ac742fdaf9b958b3b4611a38fdce7b333371d1cf095e2d1323fd654578933adda2c4604748284e2f6b5fbc1" size="16581110" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a3-13.5a6…" hashFunction="SHA512" hashValue="4f1b8188d674402974cae1373fa8fa452d9f93862885af4cb7ae555febf5a0a8c383d828b325039722aa0abb6b0f9004911a29e9f0b9a611bd7ca3bb91a9367e" size="17344873" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="7210d892e7a75d3247ac12ddc7d466df521b256c0ac76b1d2804221d3cce6d38faf327e071ce349ab460bf57e387ecfdfc523f8a94c4f62637442f03f04d8e96" size="13826633" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="422b7f0f69f4bb2474261143bbf4c947269f49ad165853636eec6f3b18708ac0e368afc5ff40efe7570413ac531337d577adb626867d1a794c39523b0c216bea" size="10315722" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a4-13.5a6…" hashFunction="SHA512" hashValue="3bb3b0c5e75d032e95fefb5320072d0aa222bbd250a5a675a2271be8b1f17b44916bd5aee0a7ccb88da329f22cf6acde09f24eb4087d59ad0fb15f7a5f626845" size="13693861" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="91a657b6ab486dd9ba34e5529737afb17bc0de2a59ec06d76dc55dc484a685d6e8b2e80be9e5ac22688f4be56da10105e63855b81c49cd46ca047f0ea8b8ee44" size="10272365" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="aba1a3b3334ee8b8833cbd2c466049ec3e8633af7936b94b7bf105e138d6d066684029c4eeeef26c2e057162ec6f5d89d8ec6a87a24f96782ff0e89a9002c208" size="11357278" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a4-13.5a7…" hashFunction="SHA512" hashValue="954f52fde24e217ebcb9297d3b4de06437179343d723939f929a313b346b8d8267ea4ce11adc248288d91362f451cb7579263027f1d4159cbb35dd6ffdc7dc9f" size="75438707" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="8a7add2e7f21554e649388793eed84e72ad6e378167c54db0b1cd6c2d38b861309eb0b7135c3beb1888a14cf9ccc77934462c3cfec26a87c462cf8b2ce12d7d3" size="10938745" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a5…" hashFunction="SHA512" hashValue="b05f7e5a78b61aaa08c2b594e90760f7e9ff79f2fdeb31381f8a2c85afa5996bcabbb08dc0b1bb5142d16a7accdb40583753f23d73806d50f0a865f810bd77ea" size="6911078" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a5-13.5a6…" hashFunction="SHA512" hashValue="3ed0b46b6cfc4d28778045acc0338ec5d6fc9e0f7f651d15607128cbf9ed1b287955670a686cf4f8e4fb3541c5cd63ed44d5548de62e9ba0eb35039aaf385fad" size="9947238" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="8080c016add033f5dca2875c747a7f8c16ad68d28ec6d4bee5cd0d40fe33d3be7c5d085bd2f44aff073a0fbf73538915c481a99b8d695d2f6f12951d60a97c62" size="6715331" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a5…" hashFunction="SHA512" hashValue="20f6c406be2a65fc95cb6f55217df1de1e404989e3e44375daf6b3247e26a4c3d7550fa750e73c09b3634b06b95549c3cef103f678fcdebd26e64381bb2b7b73" size="10785100" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a5-13.5a7…" hashFunction="SHA512" hashValue="eb7b6890b3eb2020b8f916fe1def6c05da2b20da5f4ff03175806a847fe34b7b04e770b306cd3a9cbdcb0505d03420e8b5cc54272788ebb93f941d8352c8892a" size="75285209" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="6b15fb4cb9dc42972602ad0558db2c395987ebc57fbce059a67a1192af8f6a8fc771877c9824c0e81d80933340014a39c6d51d7fdcbc35d104bc802571467834" size="9916729" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64--13.5a6…" hashFunction="SHA512" hashValue="9edd25e8674b44b3e132a01aec0388e6d19a33674a8551e2af03c4cc4342b2abc705247b4c55f4100c578b6f149e2995df467ff22a97246e109bf21e7ef8883a" size="8750651" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos--13.5a6-13.5a7…" hashFunction="SHA512" hashValue="a8c6ea5ed2d6c25061572a9e7c7dab835836f988333d69c1d63c7856221f3a8ed7a50c75747389b717794618f79c44d700f89471c6ca0859d88bea95e08c7ece" size="74047521" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-13.5a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="6e772f84a813cddf33a10164de58e43512909b445e42ee93b84627d70b206be0e4eb837f4cd3a2b23dd706e3dce0ad9bda31c3620ea016d818bf75708950b1e7" size="8577815" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a6-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a6-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a6-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a7-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7_…" hashFunction="SHA512" hashValue="2f3c39a28b3da65e5592c6cf82a48849253e396b66cd564e57213cf1f7aa6946dd4a043cbaae823e8b881578661c16b6997c294a386ab79e9c35e582420532f0" size="108177359" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a7-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7_ALL.mar" hashFunction="SHA512" hashValue="b169353967ad22a9e5b7f9911db2a0330e494971d98f009543ad29de3ca04d43945eca8707e8ceababcd84ce9e2f52bc02a3e9e343843ae545d6a619ca35aee4" size="115580635" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a7-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a7" appVersion="13.5a7" platformVersion="115.10.0" buildID="20240425120000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a7" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="07b79ad9c1a9be538b56219a64531fb77972a581adb9996241a17456b062314970c949ce5ef8d31ac2bd6e4f0aef9a8a9d7ed7332c63cf19e026e156f8f81b90" size="89800128" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","version":"13.5a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","version":"13.5a7"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg.asc","version":"13.5a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg.asc","version":"13.5a7"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","version":"13.5a6"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a7-build2","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","version":"13.5a7"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a6-build1","version":"13.5a6"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-linux-x86_64-13.5a7.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-macos-13.5a7.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a7/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a7-build2","version":"13.5a7"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… 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-13.5a7-build2
by boklm (＠boklm) 28 Apr '24

28 Apr '24

boklm pushed new tag mb-13.5a7-build2 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. 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][main] Bug 41114: Mullvad Browser 13.5a7-build2
by richard (＠richard) 25 Apr '24

25 Apr '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5059b98c by Nicolas Vigier at 2024-04-25T17:01:35+02:00 Bug 41114: Mullvad Browser 13.5a7-build2 Update pkg_revision to force rebuild of linux-packages. Having var/browser_release_date being in the past should solve the reproducibility problem of the deb file. - - - - - 5 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md - rbm.conf Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -39,7 +39,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` - - [ ] `var/browser_release_date` : update to build date + - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -39,7 +39,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` - - [ ] `var/browser_release_date` : update to build date + - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -38,7 +38,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] `var/browser_release_date` : update to build date + - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -38,7 +38,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] `var/browser_release_date` : update to build date + - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail ===================================== rbm.conf ===================================== @@ -74,11 +74,13 @@ buildconf: var: torbrowser_version: '13.5a7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - '13.5a6' - '13.5a5' - '13.5a4' + # 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: '2024/04/25 12:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- This project does not include diff previews in email notifications. 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-115.10.0esr-13.5-1] fixup! Tor Browser strings
by Pier Angelo Vendrame (＠pierov) 24 Apr '24

24 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 29ff3f1e by Henry Wilkes at 2024-04-24T16:53:07+01:00 fixup! Tor Browser strings Bug 42545: Rename "onionsite" to "onion site" in Fluent. - - - - - 1 changed file: - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -611,25 +611,25 @@ rulesets-details-scope-input = # "Regular expression" refers to the computing term for a special pattern used for matching: https://en.wikipedia.org/wiki/Regular_expression. rulesets-details-scope-input-invalid = The scope could not be parsed as a regular expression -## Onionsite error page. -## "Onionsite" is an abbreviation of "onion website": a website whose domain URL ends in ".onion", which is reachable through the Tor network. +## Onion site error page. +## "Onion site" is an abbreviation of "onion website": a website whose domain URL ends in ".onion", which is reachable through the Tor network. -onion-neterror-page-title = Problem loading onionsite +onion-neterror-page-title = Problem loading onion site onion-neterror-authorization-title = Authentication required -onion-neterror-not-found-header = Onionsite not found -onion-neterror-not-found-description = The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onion-neterror-unreachable-header = Onionsite cannot be reached -onion-neterror-unreachable-description = The onionsite is unreachable due an internal error. -onion-neterror-disconnected-header = Onionsite has disconnected -onion-neterror-disconnected-description = The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onion-neterror-connection-failed-header = Unable to connect to onionsite -onion-neterror-connection-failed-description = The onionsite is busy or the Tor network is overloaded. Try again later. -onion-neterror-missing-authentication-header = Onionsite requires authentication -onion-neterror-missing-authentication-description = Access to the onionsite requires a key but none was provided. -onion-neterror-incorrect-authentication-header = Onionsite authentication failed -onion-neterror-incorrect-authetication-description = The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onion-neterror-invalid-address-header = Invalid onionsite address -onion-neterror-invalid-address-description = The provided onionsite address is invalid. Please check that you entered it correctly. +onion-neterror-not-found-header = Onion site not found +onion-neterror-not-found-description = The most likely cause is that the onion site is offline. Contact the onion site administrator. +onion-neterror-unreachable-header = Onion site cannot be reached +onion-neterror-unreachable-description = The onion site is unreachable due an internal error. +onion-neterror-disconnected-header = Onion site has disconnected +onion-neterror-disconnected-description = The most likely cause is that the onion site is offline. Contact the onion site administrator. +onion-neterror-connection-failed-header = Unable to connect to onion site +onion-neterror-connection-failed-description = The onion site is busy or the Tor network is overloaded. Try again later. +onion-neterror-missing-authentication-header = Onion site requires authentication +onion-neterror-missing-authentication-description = Access to the onion site requires a key but none was provided. +onion-neterror-incorrect-authentication-header = Onion site authentication failed +onion-neterror-incorrect-authetication-description = The provided key is incorrect or has been revoked. Contact the onion site administrator. +onion-neterror-invalid-address-header = Invalid onion site address +onion-neterror-invalid-address-description = The provided onion site address is invalid. Please check that you entered it correctly. # "Circuit" refers to a Tor network circuit. -onion-neterror-timed-out-header = Onionsite circuit creation timed out -onion-neterror-timed-out-description = Failed to connect to the onionsite, possibly due to a poor network connection. +onion-neterror-timed-out-header = Onion site circuit creation timed out +onion-neterror-timed-out-description = Failed to connect to the onion site, possibly due to a poor network connection. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/29ff3f1… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/29ff3f1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Lox integration
by Pier Angelo Vendrame (＠pierov) 24 Apr '24

24 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 300bf571 by Henry Wilkes at 2024-04-24T12:27:50+00:00 fixup! Lox integration Bug 42543: Demote the validateInvitation console message to "info". - - - - - 1 changed file: - toolkit/components/lox/Lox.sys.mjs Changes: ===================================== toolkit/components/lox/Lox.sys.mjs ===================================== @@ -612,7 +612,7 @@ class LoxImpl { try { lazy.invitation_is_trusted(invite); } catch (err) { - lazy.logger.error(err); + lazy.logger.info(`Does not parse as an invite: "${invite}".`, err); return false; } return true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/300bf57… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/300bf57… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 24 Apr '24

24 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a5f43320 by Pier Angelo Vendrame at 2024-04-23T18:40:17+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42541: Bridges without fingerprint break the circuit display. The circuit display backend relies on GETCONF bridges because we want to know the pluggable transport for the circuit display and, as far as I can tell, no GETINFO command includes this information. However, when we get a circuit from tor, we get its fingerprint, which is optional on the bridge lines. Therefore, in some cases we did not have the data to display, and we just hid the circuit display button. With this commit, when we miss the fingerprint of a bridge, we try to get it in another way. It might produce incorrect results (we rely on the IP address the user passes on the bridge line), but at least it will show the circuit display. - - - - - 1 changed file: - toolkit/components/tor-launcher/TorControlPort.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -795,7 +795,64 @@ export class TorController { * @returns {Bridge[]} The configured bridges */ async getBridges() { - return (await this.#getConf("BRIDGE")).map(TorParsers.parseBridgeLine); + let missingId = false; + const bridges = (await this.#getConf("BRIDGE")).map(line => { + const info = TorParsers.parseBridgeLine(line); + if (!info.id) { + missingId = true; + } + return info; + }); + + // tor-browser#42541: bridge lines are allowed not to have a fingerprint. + // If such a bridge is in use, we will fail to associate it to the circuits, + // and the circuit display will not be shown. + // Tor provides a couple of GETINFO commands we can try to use to get more + // data about bridges, in particular GETINFO ns/purpose/bridge. + // While it tells us the bridge's IP (as configured by the user, which might + // be different from the real one with some PTs such as Snowflake), it does + // not tell the pluggable transport. + // Therefore, we need to start from the configured bridge lines, and if we + // detect that a bridge does not have a fingerprint, we try to associate one + // through its IP address and port. + // However, users can set them directly, therefore we might end up setting + // a fingerprint to the wrong line (e.g., if the IP address is reused). + // Also, we are not sure about when the data of ns/purpose/bridge is + // populated. + // Usually, we are interested only in the data of currently active bridges + // for the circuit display. So, as a matter of fact, we expect to have + // entries and to expose only the correct and working data in the frontend. + if (missingId) { + // See https://spec.torproject.org/dir-spec/consensus-formats.html. + // r <name> <identity> <digest> <date> <time> <address> <orport> <dirport> + const info = (await this.#getInfo("ns/purpose/bridge")).matchAll( + /^r\s+\S+\s+(?<identity>\S+)\s+\S+\s+\S+\s+\S+\s+(?<address>\S+)\s+(?<orport>\d+)/gm + ); + const b64ToHex = b64 => { + let hex = ""; + const raw = atob(b64); + for (let i = 0; i < raw.length; i++) { + hex += raw.charCodeAt(i).toString(16).toUpperCase().padStart(2, "0"); + } + return hex; + }; + const knownBridges = new Map( + Array.from(info, m => [ + `${m.groups.address}:${m.groups.orport}`, + b64ToHex(m.groups.identity), + ]) + ); + for (const b of bridges) { + if (!b.id) { + // We expect the addresses of these lines to be only IPv4, therefore + // we do not check for brackets, even though they might be matched by + // our regex. + b.id = knownBridges.get(b.addr) ?? ""; + } + } + } + + return bridges; } /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5f4332… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5f4332… 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-115.10.0esr-13.5-1-build2
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed new tag mullvad-browser-115.10.0esr-13.5-1-build2 at The Tor Project / Applications / Mullvad Browser -- This project does not include diff previews in email notifications. 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] Pushed new tag tor-browser-115.10.0esr-13.5-1-build2
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed new tag tor-browser-115.10.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. 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-build] Pushed new tag mb-13.5a7-build1
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed new tag mb-13.5a7-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. 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-13.5a7-build1
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed new tag tbb-13.5a7-build1 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. 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/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build9
by Dan Ballard (＠dan) 23 Apr '24

23 Apr '24

Dan Ballard pushed new tag firefox-android-115.2.1-13.5-1-build9 at The Tor Project / Applications / firefox-android -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41113, 41114: Prepare Tor, Mullvad Browser 13.5a7
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c382ec2a by Richard Pospesel at 2024-04-23T19:33:00+02:00 Bug 41113,41114: Prepare Tor,Mullvad Browser 13.5a7 - - - - - 13 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/tor/config - projects/translation/config - projects/zstd/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,52 @@ +Mullvad Browser 13.5a7 - April 25 2024 + * All Platforms + * Updated Firefox to 115.10.0esr + * Updated uBlock Origin to 1.57.2 + * Bug 283: New identity complains about about:mullvad-browser [mullvad-browser] + * Bug 289: The Letterboxing>Content Alignment heading doesn't follow the Firefox design document capitalization [mullvad-browser] + * Bug 291: Rebase Mullvad Browser Alpha onto 115.10.0esr [mullvad-browser] + * Bug 40919: Consider dropping protection against line-height introduced in #23104 [tor-browser] + * Bug 42172: browser.startup.homepage and TOR_DEFAULT_HOMEPAGE are ignored for the new window opened by New Identity [tor-browser] + * Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" [tor-browser] + * Bug 42315: compat: why is eventCounts undefined? [tor-browser] + * Bug 42490: Install svg from branding theme to browser/chrome/icons/default [tor-browser] + * Bug 42500: When startup window is maximized per letterboxing.rememberSize on startup, the restore button shrinks it to its minimum size [tor-browser] + * Bug 42520: Correctly record new initial window size after auto-shrinking [tor-browser] + * Bug 42529: Try not to spoof system-ui in contexts exempt from RFP [tor-browser] + * Bug 42532: Use the HomePage module for new identity checks [tor-browser] + * Bug 42537: Move Fluent files from "browser" to "toolkit" [tor-browser] + * Windows + * Bug 41901: windows: FontSubstitutes can leak system locale [tor-browser] + * Linux + * Bug 41112: Fix indentation of projects/browser/RelativeLink/start-browser [tor-browser-build] + * Build System + * All Platforms + * Bug 282: Move `--disable-eme` to OS- and architecture-specific mozconfigs [mullvad-browser] + * Bug 42519: Update the profile directory patch to check both for `system-install` and for `is-packaged-app` file [tor-browser] + * Bug 41122: Add release date to rbm.conf [tor-browser-build] + * macOS + * Bug 42535: mac: app change to ja doesn't apply ja translations to most (all?) chrome [tor-browser] + * Bug 41124: Since TB/MB 13.5a5 macos signed installers contain all .DS_Store [tor-browser-build] + * Linux + * Bug 42491: Add mozconfig-linux-aarch64 [tor-browser] + * Bug 41083: Make deb package for Mullvad Browser [tor-browser-build] + +Mullvad Browser 13.0.14 - April 16 2024 + * All Platforms + * Updated Firefox to 115.10.0esr + * Updated uBlock Origin to 1.57.2 + * Bug 271: After update, don't open the release page on Github. Instead link it in the startpage, like in Tor Browser [mullvad-browser] + * Bug 283: New identity complains about about:mullvad-browser [mullvad-browser] + * Bug 285: Rebase Mullvad Browser stable onto 115.10.0esr [mullvad-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42468: App languages not sorted correctly in stable [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Linux + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + Mullvad Browser 13.5a6 - March 28 2024 * All Platforms * Updated Firefox to 115.9.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,93 @@ +Tor Browser 13.5a7 - April 25 2024 + * All Platforms + * Updated Tor to 0.4.8.11 + * Bug 40919: Consider dropping protection against line-height introduced in #23104 [tor-browser] + * Bug 42315: compat: why is eventCounts undefined? [tor-browser] + * Bug 42476: Only allow Lox (invites) in alpha and nightly builds [tor-browser] + * Bug 42479: Switch from localized strings to error codes in TorConnect errors [tor-browser] + * Bug 42512: Rebase Tor Browser alpha onto 115.10.0esr [tor-browser] + * Bug 42521: Remove unused onboarding strings [tor-browser] + * Bug 42529: Try not to spoof system-ui in contexts exempt from RFP [tor-browser] + * Bug 42537: Move Fluent files from "browser" to "toolkit" [tor-browser] + * Bug 42538: Move onion icons to toolkit [tor-browser] + * Bug 41111: Use Lyrebird to provide WebTunnel PT Client [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.10.0esr + * Bug 40843: Add a working state to the Internet test button in connection settings [tor-browser] + * Bug 41622: Convert onion site errors to the new neterror template [tor-browser] + * Bug 41966: Cannot remove locales from the locale alternatives list [tor-browser] + * Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" [tor-browser] + * Bug 42202: Fluent migration: crypto safety [tor-browser] + * Bug 42206: Fluent migration: about:rulesets [tor-browser] + * Bug 42207: Fluent migration: preferences [tor-browser] + * Bug 42210: Fluent migration: download warning [tor-browser] + * Bug 42457: Loading icon for bridge pass (Lox) invites [tor-browser] + * Bug 42489: Lox module notifications [tor-browser] + * Bug 42490: Install svg from branding theme to browser/chrome/icons/default [tor-browser] + * Bug 42496: Moat refresh bug [tor-browser] + * Bug 42500: When startup window is maximized per letterboxing.rememberSize on startup, the restore button shrinks it to its minimum size [tor-browser] + * Bug 42504: TB Bookmarks: Add the Tor forum .onion to the bookmarks [tor-browser] + * Bug 42510: SETCONF Tor control protocol command should not be used when system Tor is configured / TOR_SKIP_LAUNCH=1 is not honored [tor-browser] + * Bug 42511: false positive message: browser tab bar shows "Not connected" even though connected in a system Tor etc. context [tor-browser] + * Bug 42520: Correctly record new initial window size after auto-shrinking [tor-browser] + * Bug 42532: Use the HomePage module for new identity checks [tor-browser] + * Bug 42533: Add Lox notification for activeLoxId [tor-browser] + * Bug 42540: Fix gNetworkStatus.deinint typo [tor-browser] + * Bug 289: The Letterboxing>Content Alignment heading doesn't follow the Firefox design document capitalization [mullvad-browser] + * Windows + * Bug 41901: windows: FontSubstitutes can leak system locale [tor-browser] + * Linux + * Bug 41112: Fix indentation of projects/browser/RelativeLink/start-browser [tor-browser-build] + * Android + * Updated GeckoView to 115.10.0esr + * Updated zstd to 1.5.6 + * Bug 42017: TBA13: system/widget font tests: font-family not returned in getComputedStyle [tor-browser] + * Bug 42195: Fix "What's new" URL to direct to latest version [tor-browser] + * Bug 42486: firefox-android bridge settings sometimes dont save [tor-browser] + * Bug 42522: The quick connect switch on Android seems too much on the right side [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.9 + * Bug 42516: Make tb-dev worktree-compatible [tor-browser] + * Bug 41122: Add release date to rbm.conf [tor-browser-build] + * Windows + macOS + Linux + * Bug 42501: Move `--disable-eme` to OS- and architecture-specific mozconfigs [tor-browser] + * Bug 42519: Update the profile directory patch to check both for `system-install` and for `is-packaged-app` file [tor-browser] + * macOS + * Bug 42535: mac: app change to ja doesn't apply ja translations to most (all?) chrome [tor-browser] + * Bug 41124: Since TB/MB 13.5a5 macos signed installers contain all .DS_Store [tor-browser-build] + * Linux + * Bug 42491: Add mozconfig-linux-aarch64 [tor-browser] + * Android + * Bug 40992: Updated torbrowser_version number is not enough to change firefox-android versionCode number [tor-browser-build] + * Bug 41127: Android testbuilds fail because of the too early MOZ_BUILD_DATE [tor-browser-build] + +Tor Browser 13.0.14 - April 16 2024 + * All Platforms + * Updated Tor to 0.4.8.11 + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42472: Timezone may leak from XSLT Date function [tor-browser] + * Bug 42508: Rebase Tor Browser stable onto 115.10.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.10.0esr + * Bug 42172: browser.startup.homepage and TOR_DEFAULT_HOMEPAGE are ignored for the new window opened by New Identity [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42468: App languages not sorted correctly in stable [tor-browser] + * Linux + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Android + * Updated GeckoView to 115.10.0esr + * Bug 42509: Backport Android security fixes from Firefox 125 [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.8 + * Bug 41107: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo for new type of URL [tor-browser-build] + * Bug 41122: Add release date to rbm.conf [tor-browser-build] + * Android + * Bug 40992: Updated torbrowser_version number is not enough to change firefox-android versionCode number [tor-browser-build] + Tor Browser 13.5a6 - March 28 2024 * All Platforms * Bug 41114: Fix no-async-promise-executor on TorConnect [tor-browser] ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,18 +17,19 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1157805, + "average_daily_users": 1162909, "categories": { "firefox": [ "web-development", "appearance", - "other" + "other", + "accessibility" ] }, "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5705306, + "id": 5718683, "compatibility": { "firefox": { "min": "78.0", @@ -39,7 +40,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/57053…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/57186…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +51,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Analyze inline background images for root elements.\n- Support for \"background\" attribute.\n- Fixed performance for asynchronously resolved inline styles.\n- Fixed freezes and incorrect work on several websites.\n- Dev Tools: Formatting of CSS fixes.\n- Users' fixes for websites." + "en-US": "- Reduced memory consumption.\n- Fixed iframes' background colors.\n- Optimized CSS @import loading.\n- Users' fixes for websites." }, - "reviewed": "2024-03-18T08:14:15Z", - "version": "4.9.80", + "reviewed": "2024-04-15T06:53:51Z", + "version": "4.9.83", "files": [ { - "id": 4249607, - "created": "2024-03-13T17:13:44Z", - "hash": "sha256:a93f1250b72cc27fe4a9b02be062c68fb079e45a1233d562852b48e1e9b99307", + "id": 4262984, + "created": "2024-04-10T20:40:08Z", + "hash": "sha256:a43cca2449de202d17040b0d91b2fb3ed4dd58ac81ec5d3fde4c9940d326c822", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 731722, + "size": 736649, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4249607/darkreader-4.9.80…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4262984/darkreader-4.9.83…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +144,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-03-18T08:14:15Z", + "last_updated": "2024-04-15T06:53:51Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +219,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5332, - "bayesian_average": 4.532093960246261, - "count": 5531, - "text_count": 1747 + "average": 4.5327, + "bayesian_average": 4.531595695870713, + "count": 5574, + "text_count": 1752 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +319,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 23454 + "weekly_downloads": 22901 }, "notes": null }, @@ -334,7 +335,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 266335, + "average_daily_users": 265075, "categories": { "firefox": [ "privacy-security" @@ -343,18 +344,18 @@ "contributions_url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=decentraleyes…", "created": "2014-06-10T05:46:02Z", "current_version": { - "id": 5613891, + "id": 5711487, "compatibility": { "firefox": { - "min": "56.0a1", + "min": "78.0", "max": "*" }, "android": { - "min": "56.0a1", + "min": "113.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/56…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/57…", "is_strict_compatibility_enabled": false, "license": { "id": 3338, @@ -365,22 +366,22 @@ "url": "http://www.mozilla.org/MPL/2.0/" }, "release_notes": { - "en-US": "<i>Enhancements:</i>\n\n- Improved object property evaluation logic.\n\n<i>Other changes:</i>\n\n- Applied various performance optimizations and stability improvements.\n- Updated resource audit tool dependencies." + "en-US": "<i>Enhancements:</i>\n\n- Added additional resources to the staging environment.\n\n<i>Other changes:</i>\n\n- Implemented mobile extension signing-related changes.\n- Improved and extended the resource audit tool." }, - "reviewed": "2023-08-30T12:55:12Z", - "version": "2.0.18", + "reviewed": "2024-03-28T20:50:08Z", + "version": "2.0.19", "files": [ { - "id": 4158232, - "created": "2023-08-24T20:38:03Z", - "hash": "sha256:f8f031ef91c02a1cb1a6552acd02b8f488693400656b4047d68f03ba0a1078d9", + "id": 4255788, + "created": "2024-03-26T20:59:58Z", + "hash": "sha256:105d65bf8189d527251647d0452715c5725af6065fba67cd08187190aae4a98f", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 6951879, + "size": 7180376, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4158232/decentraleyes-2.0…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4255788/decentraleyes-2.0…", "permissions": [ "*://*/*", "privacy", @@ -470,7 +471,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-08-30T12:55:12Z", + "last_updated": "2024-03-28T20:50:08Z", "name": { "ar": "Decentraleyes", "bg": "Decentraleyes", @@ -547,10 +548,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7986, - "bayesian_average": 4.793974484524402, - "count": 1415, - "text_count": 255 + "average": 4.7963, + "bayesian_average": 4.791679941683995, + "count": 1424, + "text_count": 258 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +636,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3292 + "weekly_downloads": 3048 }, "notes": null }, @@ -651,7 +652,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1231658, + "average_daily_users": 1227790, "categories": { "firefox": [ "privacy-security" @@ -1170,10 +1171,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7988, - "bayesian_average": 4.796088382620796, - "count": 2415, - "text_count": 458 + "average": 4.798, + "bayesian_average": 4.795280100065183, + "count": 2421, + "text_count": 457 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1197,7 +1198,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 22533 + "weekly_downloads": 19870 }, "notes": null }, @@ -1213,7 +1214,7 @@ "picture_url": null } ], - "average_daily_users": 7819848, + "average_daily_users": 7852360, "categories": { "firefox": [ "privacy-security" @@ -1222,7 +1223,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5693353, + "id": 5717409, "compatibility": { "firefox": { "min": "78.0", @@ -1233,7 +1234,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/56…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/57…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1244,22 +1245,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d2b406aad3a1689d93242d…" rel=\"nofollow\">1.56.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/39dfcbf564824557b9576b…" rel=\"nofollow\">Mind that multiple <code>uritransform</code> may apply to a single request</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a81992f7ab9a23a438d94b…" rel=\"nofollow\">Fix incorrect built-in filtering expression in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e88d43f67c0962312b76d6…" rel=\"nofollow\">Fix improper invalidation of valid <code>uritransform</code> exception filters</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0f3549a7d85e6616619d00…" rel=\"nofollow\">Improve <code>prevent-addEventListener</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/378d2611f7de534428615a…" rel=\"nofollow\">Fix Chartbeat flicker control <code>div</code>'s</a> (by @ryanbr)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bbf6c43dcdb62ea74fd182…" rel=\"nofollow\">Fix potential exfiltration of browsing history by a rogue list author through <code>permissions=</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/93a9a64cf8ec890f9a478c…" rel=\"nofollow\">Ignore event handler-related attributes in <code>set-attr</code> scriptlet</a> (suggested by @distinctmondaylilac)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4ed2b2948421552ce1c170…" rel=\"nofollow\">Fix potential exfiltration of browsing history by a rogue list author through <code>csp=</code></a> (reported by @distinctmondaylilac)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0fc7f9c779a1eb0dde44e6…" rel=\"nofollow\">Output scriptlet logging information to the logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0dc5f09464b305050627d6…" rel=\"nofollow\">Fix decompiling of scriptlet parameters</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5a4d736ff47d1505619f0b…" rel=\"nofollow\">Add support for <code>extraMatch</code> in <code>trusted-click-element</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/439735e662e837889e0dbe…" rel=\"nofollow\">Remove minimum height constraint from \"My filters\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ef423b580af2dea4a9a044…" rel=\"nofollow\">Unregister all scriptlets when disabling uBO on a specific site</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e06c923bfb016c184026f7…" rel=\"nofollow\">Allow <code>uritransform</code> to process the hash part of a URL</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3e0f743a60bf78bced8580…" rel=\"nofollow\">Remember presentation state of \"My rules\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/819053ea32148fd9ad7c6c…" rel=\"nofollow\">Fix improperly assembled <code>!#include</code> sublists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9506d56abc46f95d7412b9…" rel=\"nofollow\">Mark procedural filters with pseudo-elements selector as invalid</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9b18234e17c6871170acd1…" rel=\"nofollow\">Prevent access to picker when \"My filters\" is not enabled</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f990e686b6eacbbd0bd43a…" rel=\"nofollow\">Provide visual feedback when applying changes in \"Filter lists\" pane</a></li><li>[...]</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/738859f7b07778caaaa182…" rel=\"nofollow\">Commits history since last version</a>" + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/65a30f1a59ac2ef295f469…" rel=\"nofollow\">1.57.2</a>.\n\nThis is an emergency release to fix an issue causing differential updates to fail. The issue primarily affected Firefox because of uBO's use of indexedDB prior to 1.57.0. The issue did not affect full update of filter lists even though the asset viewer would show old versions of those lists (internally uBO compiles lists and would still correctly compile from lists fetched by full updater).\n\n<b>Fixes / changes</b>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/92c6c66077821bbbc4fd82…" rel=\"nofollow\">Fix stray lists in redesigned cache storage</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ad79f1669e12cf4cb05689…" rel=\"nofollow\">Commits history since last version</a>" }, - "reviewed": "2024-02-20T18:51:52Z", - "version": "1.56.0", + "reviewed": "2024-04-10T09:01:57Z", + "version": "1.57.2", "files": [ { - "id": 4237670, - "created": "2024-02-17T14:54:31Z", - "hash": "sha256:f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be", + "id": 4261710, + "created": "2024-04-08T13:51:42Z", + "hash": "sha256:9928e79a52cecf7cfa231fdb0699c7d7a427660d94eb10d711ed5a2f10d2eb89", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3819727, + "size": 3861786, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4261710/ublock_origin-1.5…", "permissions": [ "alarms", "dns", @@ -1379,7 +1380,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-03-26T17:25:30Z", + "last_updated": "2024-04-22T10:35:19Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1524,10 +1525,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7892, - "bayesian_average": 4.788825346990968, - "count": 17455, - "text_count": 4552 + "average": 4.7888, + "bayesian_average": 4.788425633486962, + "count": 17570, + "text_count": 4578 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1590,7 +1591,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 158166 + "weekly_downloads": 157043 }, "notes": null }, @@ -1606,7 +1607,7 @@ "picture_url": null } ], - "average_daily_users": 178562, + "average_daily_users": 180840, "categories": { "firefox": [ "photos-music-videos", @@ -1702,10 +1703,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4481, - "bayesian_average": 4.443180454772495, - "count": 1214, - "text_count": 467 + "average": 4.446, + "bayesian_average": 4.441120511767687, + "count": 1231, + "text_count": 478 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1727,7 +1728,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 386 + "weekly_downloads": 367 }, "notes": null }, @@ -1743,7 +1744,7 @@ "picture_url": null } ], - "average_daily_users": 77166, + "average_daily_users": 74977, "categories": { "firefox": [ "privacy-security", @@ -1853,10 +1854,10 @@ ], "promoted": null, "ratings": { - "average": 4.3753, - "bayesian_average": 4.3611016639271964, - "count": 405, - "text_count": 114 + "average": 4.3768, + "bayesian_average": 4.3623663717329295, + "count": 406, + "text_count": 115 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -1878,7 +1879,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1963 + "weekly_downloads": 622 }, "notes": null }, @@ -1894,7 +1895,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 309800, + "average_daily_users": 313979, "categories": { "firefox": [ "search-tools", @@ -2111,10 +2112,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6336, - "bayesian_average": 4.629244598584173, - "count": 1441, - "text_count": 284 + "average": 4.6337, + "bayesian_average": 4.629361656130135, + "count": 1455, + "text_count": 286 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2137,7 +2138,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 5510 + "weekly_downloads": 5338 }, "notes": null }, @@ -2160,7 +2161,7 @@ "picture_url": null } ], - "average_daily_users": 124783, + "average_daily_users": 126198, "categories": { "firefox": [ "search-tools", @@ -2441,10 +2442,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3766, - "bayesian_average": 4.372232748328777, - "count": 1341, - "text_count": 379 + "average": 4.3816, + "bayesian_average": 4.377221344459828, + "count": 1347, + "text_count": 380 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2464,7 +2465,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 26 + "weekly_downloads": 37 }, "notes": null }, @@ -2480,7 +2481,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 307654, + "average_daily_users": 305131, "categories": { "firefox": [ "privacy-security", @@ -2666,10 +2667,10 @@ "category": "recommended" }, "ratings": { - "average": 4.399, - "bayesian_average": 4.396311536554253, - "count": 2193, - "text_count": 842 + "average": 4.4, + "bayesian_average": 4.3973085609220925, + "count": 2205, + "text_count": 843 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2713,7 +2714,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7405 + "weekly_downloads": 7026 }, "notes": null }, @@ -2729,7 +2730,7 @@ "picture_url": null } ], - "average_daily_users": 162666, + "average_daily_users": 162878, "categories": { "firefox": [ "photos-music-videos", @@ -2838,10 +2839,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8694, - "bayesian_average": 3.8653261105375534, - "count": 1233, - "text_count": 447 + "average": 3.866, + "bayesian_average": 3.861922949733725, + "count": 1239, + "text_count": 448 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2860,7 +2861,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1444 + "weekly_downloads": 1345 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -107,9 +107,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.… name: noscript sha256sum: 05b98840b05ef2acbac333543e4b7c3d40fee2ce5fb4e29260b05e2ff6fe24cd - - URL: https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4261710/ublock_origin-1.5… name: ublock-origin - sha256sum: f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be + sha256sum: 9928e79a52cecf7cfa231fdb0699c7d7a427660d94eb10d711ed5a2f10d2eb89 enable: '[% c("var/mullvad-browser") %]' - URL: https://github.com/mullvad/browser-extension/releases/download/v0.9.0-firef… name: mullvad-extension ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 8 + browser_build: 9 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 1 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,7 @@ container: var: geckoview_version: 115.10.0esr browser_branch: 13.5-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.8[% END %]' +version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.9[% END %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -122,7 +122,7 @@ input_files: - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' # 1.21 series name: go - sha256sum: dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 + sha256sum: 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' # 1.20 series ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 150100 +version: 161678 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -23,6 +23,6 @@ input_files: - project: container-image - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: 039bdb04f97b803f0db2f12a6ba0a03a2091e8d8bd794e178c297e571f04eb7f + sha256sum: 5ceaec926295a62a946f41ec2e270dfd9d8d2fb3b57d11700ab67ed982ccc6e8 - filename: packagemanual.py name: package_script ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.10 +version: 0.4.8.11 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 891785fda28488bfe599afc8d3b9a155c0130f5f + git_hash: 76f037ba6fb13fdae3604f2ae4cdf6fcd284812a targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 020ff1e1fd29f39a75d1d7f795a4d80996472dd5 + git_hash: 03ef36ed51d2ef339c673c607097eb3a4472120c 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: 4962bd88652169e6a98afbe1d3b25847e909d213 + git_hash: 523e656f6baf0977fb798187ab83a308bc34c784 compress_tar: 'zst' targets: nightly: ===================================== projects/zstd/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 -version: 1.4.8 +version: 1.5.6 git_url: https://github.com/facebook/zstd.git -git_hash: 97a3da1df009d4dc67251de0c4b1c9d7fe286fc1 +git_hash: 794ea1b0afca0f020f4e57b6732332231fb23c70 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: ===================================== rbm.conf ===================================== @@ -73,13 +73,13 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5a6' + torbrowser_version: '13.5a7' torbrowser_build: 'build1' torbrowser_incremental_from: + - '13.5a6' - '13.5a5' - '13.5a4' - - '13.5a3' - browser_release_date: '2024/03/28 01:02:03' + browser_release_date: '2024/04/25 12:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] 4 commits: fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: c18dbfc4 by Henry Wilkes at 2024-04-23T08:34:43+02:00 fixup! Base Browser strings Bug 42537: Move base-browser.ftl to toolkit. - - - - - 149be0e5 by Henry Wilkes at 2024-04-23T08:35:45+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 42537: Move base-browser.ftl to toolkit. - - - - - da74078b by Henry Wilkes at 2024-04-23T08:35:46+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42537: Move base-browser.ftl to toolkit. - - - - - c37b5e2a by Henry Wilkes at 2024-04-23T08:35:47+02:00 fixup! Bug 41698: Reword the recommendation badges in about:addons Bug 42537: Move base-browser.ftl to toolkit. - - - - - 9 changed files: - browser/base/content/aboutDialog.xhtml - browser/base/content/browser.xhtml - browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/preferences/preferences.xhtml - browser/locales/jar.mn - browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl - browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl - toolkit/locales/jar.mn - toolkit/mozapps/extensions/content/aboutaddons.html Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -30,7 +30,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> - <html:link rel="localization" href="browser/base-browser.ftl"/> + <html:link rel="localization" href="toolkit/global/base-browser.ftl"/> <html:link rel="localization" href="browser/aboutDialogMullvad.ftl"/> </linkset> ===================================== browser/base/content/browser.xhtml ===================================== @@ -88,7 +88,7 @@ <link rel="localization" href="toolkit/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> <link rel="localization" href="toolkit/printing/printUI.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/>  <link rel="localization" href="preview/firefoxSuggest.ftl" /> <link rel="localization" href="preview/identityCredentialNotification.ftl" /> ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -22,7 +22,7 @@ <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> <linkset> <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="browser/base-browser.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> </linkset> <div xmlns="http://www.w3.org/1999/xhtml"> ===================================== browser/components/preferences/preferences.xhtml ===================================== @@ -57,7 +57,7 @@ <link rel="localization" href="security/certificates/certManager.ftl"/> <link rel="localization" href="security/certificates/deviceManager.ftl"/> <link rel="localization" href="toolkit/updates/history.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/> <link rel="localization" href="browser/mullvad-browser/preferences.ftl"/> <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/> ===================================== browser/locales/jar.mn ===================================== @@ -14,7 +14,6 @@ preview/firefoxSuggest.ftl (../components/urlbar/content/firefoxSuggest.ftl) preview/identityCredentialNotification.ftl (../components/credentialmanager/identityCredentialNotification.ftl) preview/stripOnShare.ftl (../components/urlbar/content/stripOnShare.ftl) - preview/base-browser-no-translate.ftl (../locales-preview/base-browser-no-translate.ftl) browser (%browser/**/*.ftl) @AB_CD@.jar: ===================================== browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl ===================================== ===================================== browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== ===================================== toolkit/locales/jar.mn ===================================== @@ -8,6 +8,7 @@ services (%services/**/*.ftl) toolkit (%toolkit/**/*.ftl) locales-preview/aboutTranslations.ftl (../locales-preview/aboutTranslations.ftl) + locales-preview/base-browser-no-translate.ftl (../locales-preview/base-browser-no-translate.ftl) #ifdef MOZ_LAYOUT_DEBUGGER layoutdebug/layoutdebug.ftl (../../layout/tools/layout-debug/ui/content/layoutdebug.ftl) #endif ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -35,7 +35,7 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl" /> <link rel="localization" href="toolkit/about/abuseReports.ftl" /> - <link rel="localization" href="browser/base-browser.ftl" /> + <link rel="localization" href="toolkit/global/base-browser.ftl" />  <script View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/04… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/04… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.10.0esr-13.5-1] 4 commits: fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 23 Apr '24

23 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f1d27be7 by Henry Wilkes at 2024-04-22T20:49:17+01:00 fixup! Base Browser strings Bug 42537: Move base-browser.ftl to toolkit. - - - - - 3aa48e65 by Henry Wilkes at 2024-04-22T20:49:43+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 42537: Move base-browser.ftl to toolkit. - - - - - a402e72c by Henry Wilkes at 2024-04-22T20:49:47+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42537: Move base-browser.ftl to toolkit. - - - - - ca81f26e by Henry Wilkes at 2024-04-22T20:49:47+01:00 fixup! Bug 41698: Reword the recommendation badges in about:addons Bug 42537: Move base-browser.ftl to toolkit. - - - - - 9 changed files: - browser/base/content/aboutDialog.xhtml - browser/base/content/browser.xhtml - browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/preferences/preferences.xhtml - browser/locales/jar.mn - browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl - browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl - toolkit/locales/jar.mn - toolkit/mozapps/extensions/content/aboutaddons.html Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -30,7 +30,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> - <html:link rel="localization" href="browser/base-browser.ftl"/> + <html:link rel="localization" href="toolkit/global/base-browser.ftl"/> </linkset> <html:div id="aboutDialogContainer"> ===================================== browser/base/content/browser.xhtml ===================================== @@ -88,7 +88,7 @@ <link rel="localization" href="toolkit/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> <link rel="localization" href="toolkit/printing/printUI.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/>  <link rel="localization" href="preview/firefoxSuggest.ftl" /> <link rel="localization" href="preview/identityCredentialNotification.ftl" /> ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -22,7 +22,7 @@ <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> <linkset> <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="browser/base-browser.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> </linkset> <div xmlns="http://www.w3.org/1999/xhtml"> ===================================== browser/components/preferences/preferences.xhtml ===================================== @@ -57,7 +57,7 @@ <link rel="localization" href="security/certificates/certManager.ftl"/> <link rel="localization" href="security/certificates/deviceManager.ftl"/> <link rel="localization" href="toolkit/updates/history.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/> <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/> ===================================== browser/locales/jar.mn ===================================== @@ -14,7 +14,6 @@ preview/firefoxSuggest.ftl (../components/urlbar/content/firefoxSuggest.ftl) preview/identityCredentialNotification.ftl (../components/credentialmanager/identityCredentialNotification.ftl) preview/stripOnShare.ftl (../components/urlbar/content/stripOnShare.ftl) - preview/base-browser-no-translate.ftl (../locales-preview/base-browser-no-translate.ftl) browser (%browser/**/*.ftl) @AB_CD@.jar: ===================================== browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl ===================================== ===================================== browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== ===================================== toolkit/locales/jar.mn ===================================== @@ -8,6 +8,7 @@ services (%services/**/*.ftl) toolkit (%toolkit/**/*.ftl) locales-preview/aboutTranslations.ftl (../locales-preview/aboutTranslations.ftl) + locales-preview/base-browser-no-translate.ftl (../locales-preview/base-browser-no-translate.ftl) #ifdef MOZ_LAYOUT_DEBUGGER layoutdebug/layoutdebug.ftl (../../layout/tools/layout-debug/ui/content/layoutdebug.ftl) #endif ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -35,7 +35,7 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl" /> <link rel="localization" href="toolkit/about/abuseReports.ftl" /> - <link rel="localization" href="browser/base-browser.ftl" /> + <link rel="localization" href="toolkit/global/base-browser.ftl" />  <script View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5616a8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5616a8… You're receiving this email because of your account on gitlab.torproject.org.

1 0