- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 2 commits: Revert "Bug 42378: Apply spoof English to the default detail summary."
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 9b2bf2b7 by Pier Angelo Vendrame at 2024-03-12T11:21:42+01:00 Revert "Bug 42378: Apply spoof English to the default detail summary." This reverts commit bdfc4f4cd8acca6cfd851fdc9866b27392c4fe68. - - - - - 643bcfc0 by Pier Angelo Vendrame at 2024-03-12T11:22:09+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.0-1] Bug 1880988 - Apply spoof English to the default detail summary. r=emilio
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: e53013fd by Pier Angelo Vendrame at 2024-03-12T11:21:05+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 1 changed file: - dom/html/HTMLDetailsElement.cpp Changes: ===================================== dom/html/HTMLDetailsElement.cpp ===================================== @@ -105,8 +105,9 @@ void HTMLDetailsElement::SetupShadowTree() { } nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetMaybeLocalizedString(nsContentUtils::eFORMS_PROPERTIES, + "DefaultSummary", OwnerDoc(), + defaultSummaryText); RefPtr<nsTextNode> description = new (nim) nsTextNode(nim); description->SetText(defaultSummaryText, kNotify); summary->AppendChildTo(description, kNotify, IgnoreErrors()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e53… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e53… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.0-1] Bug 1880988 - Apply spoof English to the default detail summary. r=emilio
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a85248c by Pier Angelo Vendrame at 2024-03-12T11:20:32+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 1 changed file: - dom/html/HTMLDetailsElement.cpp Changes: ===================================== dom/html/HTMLDetailsElement.cpp ===================================== @@ -105,8 +105,9 @@ void HTMLDetailsElement::SetupShadowTree() { } nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetMaybeLocalizedString(nsContentUtils::eFORMS_PROPERTIES, + "DefaultSummary", OwnerDoc(), + defaultSummaryText); RefPtr<nsTextNode> description = new (nim) nsTextNode(nim); description->SetText(defaultSummaryText, kNotify); summary->AppendChildTo(description, kNotify, IgnoreErrors()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a85248… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a85248… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.0-1] Bug 1880988 - Apply spoof English to the default detail summary. r=emilio
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 12196262 by Pier Angelo Vendrame at 2024-03-12T11:19:26+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 1 changed file: - dom/html/HTMLDetailsElement.cpp Changes: ===================================== dom/html/HTMLDetailsElement.cpp ===================================== @@ -105,8 +105,9 @@ void HTMLDetailsElement::SetupShadowTree() { } nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetMaybeLocalizedString(nsContentUtils::eFORMS_PROPERTIES, + "DefaultSummary", OwnerDoc(), + defaultSummaryText); RefPtr<nsTextNode> description = new (nim) nsTextNode(nim); description->SetText(defaultSummaryText, kNotify); summary->AppendChildTo(description, kNotify, IgnoreErrors()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1219626… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1219626… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] 2 commits: Revert "Bug 42378: Apply spoof English to the default detail summary."
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 07698e51 by Pier Angelo Vendrame at 2024-03-12T11:16:42+01:00 Revert "Bug 42378: Apply spoof English to the default detail summary." This reverts commit bdfc4f4cd8acca6cfd851fdc9866b27392c4fe68. - - - - - d15214a2 by Pier Angelo Vendrame at 2024-03-12T11:16:53+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12b60a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12b60a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 2 commits: Revert "Bug 42378: Apply spoof English to the default detail summary."
by Pier Angelo Vendrame (＠pierov) 12 Mar '24

12 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c152f2c2 by Pier Angelo Vendrame at 2024-03-12T10:18:09+01:00 Revert "Bug 42378: Apply spoof English to the default detail summary." This reverts commit bdfc4f4cd8acca6cfd851fdc9866b27392c4fe68. - - - - - 2cf77af7 by Pier Angelo Vendrame at 2024-03-12T10:18:40+01:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8451a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8451a… 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! Add Tor integration and UI
by ma1 (＠ma1) 12 Mar '24

12 Mar '24

ma1 pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 2bc609e5 by hackademix at 2024-03-12T10:34:19+01:00 fixup! Add Tor integration and UI Bug 42440: Remove the "Prioritize .onion sites when known" option - - - - - 8 changed files: - android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - fenix/app/src/main/res/values/preference_keys.xml - fenix/app/src/main/res/values/torbrowser_strings.xml - fenix/app/src/main/res/xml/preferences.xml Changes: ===================================== android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -796,9 +796,6 @@ class GeckoEngine( localeUpdater.updateValue() } } - override var prioritizeOnions: Boolean - get() = runtime.settings.prioritizeOnions - set(value) { runtime.settings.prioritizeOnions = value } override var useNewBootstrap: Boolean get() = runtime.settings.useNewBootstrap set(value) { @@ -828,7 +825,6 @@ class GeckoEngine( this.cookieBannerHandlingDetectOnlyMode = it.cookieBannerHandlingDetectOnlyMode this.torSecurityLevel = it.torSecurityLevel this.spoofEnglish = it.spoofEnglish - this.prioritizeOnions = it.prioritizeOnions this.useNewBootstrap = it.useNewBootstrap } } ===================================== android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -213,8 +213,6 @@ abstract class Settings { open var spoofEnglish: Boolean by UnsupportedSetting() - open var prioritizeOnions: Boolean by UnsupportedSetting() - open var useNewBootstrap: Boolean by UnsupportedSetting() } @@ -260,7 +258,6 @@ data class DefaultSettings( override var cookieBannerHandlingDetectOnlyMode: Boolean = false, override var torSecurityLevel: Int = 4, override var spoofEnglish: Boolean = false, - override var prioritizeOnions: Boolean = false, override var useNewBootstrap: Boolean = false, ) : Settings() ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -145,7 +145,6 @@ class Core( .shouldShowCookieBannerReEngagementDialog(), torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, spoofEnglish = context.settings().spoofEnglish, - prioritizeOnions = context.settings().prioritizeOnions, useNewBootstrap = context.settings().useNewBootstrap, ) ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -462,10 +462,8 @@ class SettingsFragment : PreferenceFragmentCompat() { } private fun setupPreferences() { - val prioritizeOnionsKey = getPreferenceKey(R.string.pref_key_tor_prioritize_onions) val leakKey = getPreferenceKey(R.string.pref_key_leakcanary) val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging) - val preferencePrioritizeOnions = findPreference<Preference>(prioritizeOnionsKey) val preferenceLeakCanary = findPreference<Preference>(leakKey) val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey) val preferenceMakeDefaultBrowser = @@ -484,13 +482,6 @@ class SettingsFragment : PreferenceFragmentCompat() { } } - preferencePrioritizeOnions?.setOnPreferenceChangeListener<Boolean> { preference, newValue -> - preference.context.settings().preferences.edit() - .putBoolean(preference.key, newValue).apply() - requireComponents.core.engine.settings.prioritizeOnions = newValue - true - } - if (!Config.channel.isReleased) { preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue -> val isEnabled = newValue == true ===================================== fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -335,11 +335,6 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = false ) - var prioritizeOnions by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tor_prioritize_onions), - default = false - ) - var defaultSearchEngineName by stringPreference( appContext.getPreferenceKey(R.string.pref_key_search_engine), default = "", ===================================== fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -393,6 +393,4 @@ <string name="pref_key_tor_network_settings_bridges_enabled">pref_key_tor_network_settings_bridges_enabled</string> <string name="pref_key_spoof_english" translatable="false">pref_key_spoof_english</string> - - <string name="pref_key_tor_prioritize_onions" translatable="false">pref_key_tor_prioritize_onions</string> </resources> ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -72,8 +72,6 @@  <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> -  - <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string>  <string name="connection_assist_tor_connect_title">Connect to Tor</string> ===================================== fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -122,11 +122,6 @@ app:iconSpaceReserved="false" android:title="@string/preferences_tor_network_settings" /> - <SwitchPreference - android:key="@string/pref_key_tor_prioritize_onions" - app:iconSpaceReserved="false" - android:title="@string/preferences_tor_prioritize_onions" /> - <androidx.preference.Preference android:key="@string/pref_key_tracking_protection_settings" app:iconSpaceReserved="false" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2bc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.9.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

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

1 0

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

11 Mar '24

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_9_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

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

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 56f2b71c by Dan Ballard at 2024-03-11T17:43:00+01:00 fixup! Disable features and functionality bug 42407: lock task affinity of HomeActivity to block potential on app phishing - - - - - 1 changed file: - fenix/app/src/main/AndroidManifest.xml Changes: ===================================== fenix/app/src/main/AndroidManifest.xml ===================================== @@ -96,6 +96,7 @@ android:exported="true" android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|layoutDirection|smallestScreenSize|screenLayout" android:launchMode="singleTask" + android:taskAffinity="" android:resizeableActivity="true" android:supportsPictureInPicture="true" android:windowSoftInputMode="adjustResize"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/56f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/56f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

11 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9cecc61f by Pier Angelo Vendrame at 2024-03-11T09:33:51+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42336: Rework the relationship between TorSettings and TorProvider. - - - - - 138e8d6b by Pier Angelo Vendrame at 2024-03-11T16:19:47+01:00 fixup! Bug 40597: Implement TorSettings module Bug 42336: Rework the relationship between TorSettings and TorProvider. - - - - - 6265cc34 by Pier Angelo Vendrame at 2024-03-11T16:19:52+01:00 fixup! Bug 42247: Android helpers for the TorProvider Bug 42336: Rework the relationship between TorSettings and TorProvider. - - - - - e409c32a by Pier Angelo Vendrame at 2024-03-11T16:19:52+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42336: Rework the relationship between TorSettings and TorProvider. - - - - - f8451ae0 by Pier Angelo Vendrame at 2024-03-11T16:19:53+01:00 fixup! Bug 40597: Implement TorSettings module Use a logger instead of console in TorConnect. - - - - - 10 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionSettingsDialog.js - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - toolkit/components/tor-launcher/TorStartupService.sys.mjs - toolkit/modules/Moat.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -114,10 +114,9 @@ async function setTorSettings(changes) { // This will trigger TorSettings.#cleanupSettings() TorSettings.saveToPrefs(); try { - // May throw. await TorSettings.applySettings(); } catch (e) { - console.error("Failed to save Tor settings", e); + console.error("Failed to apply Tor settings", e); } } finally { TorSettings.thawNotifications(); ===================================== browser/components/torpreferences/content/connectionSettingsDialog.js ===================================== @@ -362,6 +362,8 @@ const gConnectionSettingsDialog = { } TorSettings.saveToPrefs(); + // FIXME: What if this fails? Should we prevent the dialog to close and show + // an error? TorSettings.applySettings(); }, }; ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -838,10 +838,12 @@ export class TorController { /** * Send multiple configuration values to tor. * - * @param {object} values The values to set + * @param {Array} values The values to set. It should be an array of + * [key, value] pairs to pass to SETCONF. Keys can be repeated, and array + * values will be automatically unrolled. */ async setConf(values) { - const args = Object.entries(values) + const args = values .flatMap(([key, value]) => { if (value === undefined || value === null) { return [key]; @@ -871,7 +873,7 @@ export class TorController { * @param {boolean} enabled Tell whether the network should be enabled */ async setNetworkEnabled(enabled) { - return this.setConf({ DisableNetwork: !enabled }); + return this.setConf([["DisableNetwork", !enabled]]); } /** ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -15,6 +15,8 @@ ChromeUtils.defineESModuleGetters(lazy, { TorController: "resource://gre/modules/TorControlPort.sys.mjs", TorProcess: "resource://gre/modules/TorProcess.sys.mjs", TorProcessAndroid: "resource://gre/modules/TorProcessAndroid.sys.mjs", + TorProxyType: "resource://gre/modules/TorSettings.sys.mjs", + TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); const logger = new ConsoleAPI({ @@ -73,6 +75,20 @@ const Preferences = Object.freeze({ PromptAtStartup: "extensions.torlauncher.prompt_at_startup", }); +/* Config Keys used to configure tor daemon */ +const TorConfigKeys = Object.freeze({ + useBridges: "UseBridges", + bridgeList: "Bridge", + socks4Proxy: "Socks4Proxy", + socks5Proxy: "Socks5Proxy", + socks5ProxyUsername: "Socks5ProxyUsername", + socks5ProxyPassword: "Socks5ProxyPassword", + httpsProxy: "HTTPSProxy", + httpsProxyAuthenticator: "HTTPSProxyAuthenticator", + reachableAddresses: "ReachableAddresses", + clientTransportPlugin: "ClientTransportPlugin", +}); + /** * This is a Tor provider for the C Tor daemon. * @@ -166,15 +182,6 @@ export class TorProvider { */ #currentBridge = null; - /** - * Maintain a map of tor settings set by Tor Browser so that we don't - * repeatedly set the same key/values over and over. - * This map contains string keys to primitives or array values. - * - * @type {Map<string, any>} - */ - #settingsCache = new Map(); - /** * Starts a new tor process and connect to its control port, or connect to the * control port of an existing tor daemon. @@ -219,13 +226,22 @@ export class TorProvider { throw e; } + try { + await lazy.TorSettings.initializedPromise; + await this.writeSettings(lazy.TorSettings.getSettings()); + } catch (e) { + logger.warn( + "Failed to initialize TorSettings or to write our settings, so uninitializing.", + e + ); + this.uninit(); + throw e; + } + TorLauncherUtil.setProxyConfiguration(this.#socksSettings); logger.info("The Tor provider is ready."); - logger.debug(`Notifying ${TorProviderTopics.ProcessIsReady}`); - Services.obs.notifyObservers(null, TorProviderTopics.ProcessIsReady); - // If we are using an external Tor daemon, we might need to fetch circuits // already, in case streams use them. Do not await because we do not want to // block the intialization on this (it should not fail anyway...). @@ -252,42 +268,74 @@ export class TorProvider { // Provider API - async writeSettings(settingsObj) { - // TODO: Move the translation from settings object to settings understood by - // tor here. - const entries = - settingsObj instanceof Map - ? Array.from(settingsObj.entries()) - : Object.entries(settingsObj); - // only write settings that have changed - const newSettings = entries.filter(([setting, value]) => { - if (!this.#settingsCache.has(setting)) { - // no cached setting, so write - return true; - } + /** + * Send settings to the tor daemon. + * + * @param {object} settings A settings object, as returned by + * TorSettings.getSettings(). This allow to try settings without passing + * through TorSettings. + */ + async writeSettings(settings) { + logger.debug("TorProvider.writeSettings", settings); + const torSettings = new Map(); + + // Bridges + const haveBridges = + settings.bridges?.enabled && !!settings.bridges.bridge_strings.length; + torSettings.set(TorConfigKeys.useBridges, haveBridges); + if (haveBridges) { + torSettings.set( + TorConfigKeys.bridgeList, + settings.bridges.bridge_strings + ); + } else { + torSettings.set(TorConfigKeys.bridgeList, null); + } - const cachedValue = this.#settingsCache.get(setting); - // Arrays are the only special case for which === could fail. - // The other values we accept (strings, booleans, numbers, null and - // undefined) work correctly with ===. - if (Array.isArray(value) && Array.isArray(cachedValue)) { - return ( - value.length !== cachedValue.length || - value.some((val, idx) => val !== cachedValue[idx]) + // Proxy + torSettings.set(TorConfigKeys.socks4Proxy, null); + torSettings.set(TorConfigKeys.socks5Proxy, null); + torSettings.set(TorConfigKeys.socks5ProxyUsername, null); + torSettings.set(TorConfigKeys.socks5ProxyPassword, null); + torSettings.set(TorConfigKeys.httpsProxy, null); + torSettings.set(TorConfigKeys.httpsProxyAuthenticator, null); + if (settings.proxy && !settings.proxy.enabled) { + settings.proxy.type = null; + } + const address = settings.proxy?.address; + const port = settings.proxy?.port; + const username = settings.proxy?.username; + const password = settings.proxy?.password; + switch (settings.proxy?.type) { + case lazy.TorProxyType.Socks4: + torSettings.set(TorConfigKeys.socks4Proxy, `${address}:${port}`); + break; + case lazy.TorProxyType.Socks5: + torSettings.set(TorConfigKeys.socks5Proxy, `${address}:${port}`); + torSettings.set(TorConfigKeys.socks5ProxyUsername, username); + torSettings.set(TorConfigKeys.socks5ProxyPassword, password); + break; + case lazy.TorProxyType.HTTPS: + torSettings.set(TorConfigKeys.httpsProxy, `${address}:${port}`); + torSettings.set( + TorConfigKeys.httpsProxyAuthenticator, + `${username}:${password}` ); - } - return value !== cachedValue; - }); - - // only write if new setting to save - if (newSettings.length) { - await this.#controller.setConf(Object.fromEntries(newSettings)); + break; + } - // save settings to cache after successfully writing to Tor - for (const [setting, value] of newSettings) { - this.#settingsCache.set(setting, value); - } + // Firewall + if (settings.firewall?.enabled) { + const reachableAddresses = settings.firewall.allowed_ports + .map(port => `*:${port}`) + .join(","); + torSettings.set(TorConfigKeys.reachableAddresses, reachableAddresses); + } else { + torSettings.set(TorConfigKeys.reachableAddresses, null); } + + logger.debug("Mapped settings object", settings, torSettings); + await this.#controller.setConf(Array.from(torSettings)); } async flushSettings() { ===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -9,7 +9,6 @@ ChromeUtils.defineESModuleGetters(lazy, { }); export const TorProviderTopics = Object.freeze({ - ProcessIsReady: "TorProcessIsReady", ProcessExited: "TorProcessExited", BootstrapStatus: "TorBootstrapStatus", BootstrapError: "TorBootstrapError", ===================================== toolkit/components/tor-launcher/TorStartupService.sys.mjs ===================================== @@ -31,15 +31,16 @@ export class TorStartupService { } } - async #init() { + #init() { Services.obs.addObserver(this, BrowserTopics.QuitApplicationGranted); - // Do not await on this init. build() is expected to await the - // initialization, so anything that should need the Tor Provider should - // block there, instead. + lazy.TorSettings.init(); + + // Theoretically, build() is expected to await the initialization of the + // provider, and anything needing the Tor Provider should be able to just + // await on TorProviderBuilder.build(). lazy.TorProviderBuilder.init(); - await lazy.TorSettings.init(); lazy.TorConnect.init(); lazy.TorDomainIsolator.init(); ===================================== toolkit/modules/Moat.sys.mjs ===================================== @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { TorBridgeSource } from "resource://gre/modules/TorSettings.sys.mjs"; - const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { DomainFrontRequestBuilder: "resource://gre/modules/DomainFrontedRequests.sys.mjs", + TorBridgeSource: "resource://gre/modules/TorSettings.sys.mjs", + TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); const TorLauncherPrefs = Object.freeze({ @@ -211,13 +211,23 @@ export class MoatRPC { }; switch (settings.bridges.source) { case "builtin": - retval.bridges.source = TorBridgeSource.BuiltIn; + retval.bridges.source = lazy.TorBridgeSource.BuiltIn; retval.bridges.builtin_type = settings.bridges.type; // TorSettings will ignore strings for built-in bridges, and use the - // ones it already knows, instead. + // ones it already knows, instead. However, when we try these settings + // in the connect assist, we skip TorSettings. Therefore, we set the + // lines also here (the ones we already known, not the ones we receive + // from Moat). This needs TorSettings to be initialized, which by now + // should have already happened (this method is used only by TorConnect, + // that needs TorSettings to be initialized). + // In any case, getBuiltinBridges will throw if the data is not ready, + // yet. + retval.bridges.bridge_strings = lazy.TorSettings.getBuiltinBridges( + settings.bridges.type + ); break; case "bridgedb": - retval.bridges.source = TorBridgeSource.BridgeDB; + retval.bridges.source = lazy.TorBridgeSource.BridgeDB; if (settings.bridges.bridge_strings) { retval.bridges.bridge_strings = settings.bridges.bridge_strings; } else { ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -150,7 +150,7 @@ class TorAndroidIntegrationImpl { lazy.TorSettings.saveToPrefs(); } if (data.apply) { - lazy.TorSettings.applySettings(); + await lazy.TorSettings.applySettings(); } break; case ListenedEvents.settingsApply: ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -2,14 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + ConsoleAPI: "resource://gre/modules/Console.sys.mjs", EventDispatcher: "resource://gre/modules/Messaging.sys.mjs", MoatRPC: "resource://gre/modules/Moat.sys.mjs", TorBootstrapRequest: "resource://gre/modules/TorBootstrapRequest.sys.mjs", + TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", }); // TODO: Should we move this to the about:torconnect actor? @@ -20,10 +23,7 @@ ChromeUtils.defineModuleGetter( ); import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs"; -import { - TorSettings, - TorSettingsTopics, -} from "resource://gre/modules/TorSettings.sys.mjs"; +import { TorSettings } from "resource://gre/modules/TorSettings.sys.mjs"; import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs"; @@ -40,6 +40,7 @@ const TorLauncherPrefs = Object.freeze({ const TorConnectPrefs = Object.freeze({ censorship_level: "torbrowser.debug.censorship_level", allow_internet_test: "torbrowser.bootstrap.allow_internet_test", + log_level: "torbrowser.bootstrap.log_level", }); export const TorConnectState = Object.freeze({ @@ -59,6 +60,17 @@ export const TorConnectState = Object.freeze({ Disabled: "Disabled", }); +XPCOMUtils.defineLazyGetter( + lazy, + "logger", + () => + new lazy.ConsoleAPI({ + maxLogLevel: "info", + maxLogLevelPref: TorConnectPrefs.log_level, + prefix: "TorConnect", + }) +); + /* TorConnect State Transitions @@ -194,12 +206,12 @@ class StateCallback { } async begin(...args) { - console.log(`TorConnect: Entering ${this._state} state`); + lazy.logger.trace(`Entering ${this._state} state`); this._init(); try { // this Promise will block until this StateCallback has completed its work await Promise.resolve(this._callback.call(this._context, ...args)); - console.log(`TorConnect: Exited ${this._state} state`); + lazy.logger.info(`Exited ${this._state} state`); // handled state transition Services.obs.notifyObservers( @@ -267,16 +279,14 @@ class InternetTest { this.cancel(); this._pending = true; - console.log("TorConnect: starting the Internet test"); + lazy.logger.info("Starting the Internet test"); this._testAsync() .then(status => { this._pending = false; this._status = status.successful ? InternetStatus.Online : InternetStatus.Offline; - console.log( - `TorConnect: performed Internet test, outcome ${this._status}` - ); + lazy.logger.info(`Performed Internet test, outcome ${this._status}`); this.onResult(this.status, status.date); }) .catch(error => { @@ -305,7 +315,7 @@ class InternetTest { await mrpc.init(); status = await mrpc.testInternetConnection(); } catch (err) { - console.error("Error while checking the Internet connection", err); + lazy.logger.error("Error while checking the Internet connection", err); error = err; } finally { mrpc.uninit(); @@ -523,8 +533,8 @@ export const TorConnect = (() => { // get "Building circuits: Establishing a Tor circuit failed". // TODO: Maybe move this logic deeper in the process to know // when to filter out such errors triggered by cancelling. - console.log( - `TorConnect: Post-cancel error => ${message}; ${details}` + lazy.logger.warn( + `Post-cancel error => ${message}; ${details}` ); return; } @@ -628,7 +638,7 @@ export const TorConnect = (() => { "vanilla", ]); } catch (err) { - console.error( + lazy.logger.error( "We did not get localized settings, and default settings failed as well", err ); @@ -651,10 +661,19 @@ export const TorConnect = (() => { } } + const restoreOriginalSettings = async () => { + try { + await TorSettings.applySettings(); + } catch (e) { + // We cannot do much if the original settings were bad or + // if the connection closed, so just report it in the + // console. + lazy.logger.warn("Failed to restore original settings.", e); + } + }; + // apply each of our settings and try to bootstrap with each try { - this.originalSettings = TorSettings.getSettings(); - for (const [ index, currentSetting, @@ -664,14 +683,32 @@ export const TorConnect = (() => { break; } - console.log( - `TorConnect: Attempting Bootstrap with configuration ${ - index + 1 - }/${this.settings.length}` + lazy.logger.info( + `Attempting Bootstrap with configuration ${index + 1}/${ + this.settings.length + }` ); - TorSettings.setSettings(currentSetting); - await TorSettings.applySettings(); + // Send the new settings directly to the provider. We will + // save them only if the bootstrap succeeds. + // FIXME: We should somehow signal TorSettings users that we + // have set custom settings, and they should not apply + // theirs until we are done with trying ours. + // Otherwise, the new settings provided by the user while we + // were bootstrapping could be the ones that cause the + // bootstrap to succeed, but we overwrite them (unless we + // backup the original settings, and then save our new + // settings only if they have not changed). + // Another idea (maybe easier to implement) is to disable + // the settings UI while *any* bootstrap is going on. + // This is also documented in tor-browser#41921. + const provider = await lazy.TorProviderBuilder.build(); + // We need to merge with old settings, in case the user is + // using a proxy or is behind a firewall. + await provider.writeSettings({ + ...TorSettings.getSettings(), + ...currentSetting, + }); // build out our bootstrap request const tbr = new lazy.TorBootstrapRequest(); @@ -679,8 +716,8 @@ export const TorConnect = (() => { TorConnect._updateBootstrapStatus(progress, status); }; tbr.onbootstraperror = (message, details) => { - console.log( - `TorConnect: Auto-Bootstrap error => ${message}; ${details}` + lazy.logger.error( + `Auto-Bootstrap error => ${message}; ${details}` ); }; @@ -688,6 +725,7 @@ export const TorConnect = (() => { this.on_transition = async nextState => { if (nextState === TorConnectState.Configuring) { await tbr.cancel(); + await restoreOriginalSettings(); } resolve(); }; @@ -695,23 +733,20 @@ export const TorConnect = (() => { // begin bootstrap if (await tbr.bootstrap()) { // persist the current settings to preferences + TorSettings.setSettings(currentSetting); TorSettings.saveToPrefs(); + await TorSettings.applySettings(); TorConnect._changeState(TorConnectState.Bootstrapped); return; } } - // bootstrapped failed for all potential settings, so reset daemon to use original - TorSettings.setSettings(this.originalSettings); - // The original settings should be good, so we save them to - // preferences before trying to apply them, as it might fail - // if the actual problem is with the connection to the control - // port. - // FIXME: We should handle this case in a better way. - TorSettings.saveToPrefs(); - await TorSettings.applySettings(); - - // only explicitly change state here if something else has not transitioned us + // Bootstrap failed for all potential settings, so restore the + // original settings the provider. + await restoreOriginalSettings(); + + // Only explicitly change state here if something else has not + // transitioned us. if (!this.transitioning) { throw_error( TorStrings.torConnect.autoBootstrappingFailed, @@ -720,18 +755,8 @@ export const TorConnect = (() => { } return; } catch (err) { - // restore original settings in case of error - try { - TorSettings.setSettings(this.originalSettings); - // As above - TorSettings.saveToPrefs(); - await TorSettings.applySettings(); - } catch (errRestore) { - console.log( - `TorConnect: Failed to restore original settings => ${errRestore}` - ); - } - // throw to outer catch to transition us + await restoreOriginalSettings(); + // throw to outer catch to transition us. throw err; } } catch (err) { @@ -748,8 +773,8 @@ export const TorConnect = (() => { true ); } else { - console.error( - "TorConnect: Received AutoBootstrapping error after transitioning", + lazy.logger.error( + "Received AutoBootstrapping error after transitioning", err ); } @@ -793,8 +818,8 @@ export const TorConnect = (() => { TorConnect._errorMessage = errorMessage; TorConnect._errorDetails = errorDetails; - console.error( - `[TorConnect] Entering error state (${errorMessage}, ${errorDetails})` + lazy.logger.error( + `Entering error state (${errorMessage}, ${errorDetails})` ); Services.obs.notifyObservers( @@ -835,9 +860,7 @@ export const TorConnect = (() => { ); } - console.log( - `TorConnect: Try transitioning from ${prevState} to ${newState}` - ); + lazy.logger.trace(`Try transitioning from ${prevState} to ${newState}`); // set our new state first so that state transitions can themselves trigger // a state transition @@ -851,8 +874,8 @@ export const TorConnect = (() => { this._bootstrapProgress = progress; this._bootstrapStatus = status; - console.log( - `TorConnect: Bootstrapping ${this._bootstrapProgress}% complete (${this._bootstrapStatus})` + lazy.logger.info( + `Bootstrapping ${this._bootstrapProgress}% complete (${this._bootstrapStatus})` ); Services.obs.notifyObservers( { @@ -866,7 +889,7 @@ export const TorConnect = (() => { // init should be called by TorStartupService init() { - console.log("TorConnect: init()"); + lazy.logger.debug("TorConnect.init()"); this._callback(TorConnectState.Initial).begin(); if (!this.enabled) { @@ -875,9 +898,17 @@ export const TorConnect = (() => { } else { let observeTopic = addTopic => { Services.obs.addObserver(this, addTopic); - console.log(`TorConnect: Observing topic '${addTopic}'`); + lazy.logger.debug(`Observing topic '${addTopic}'`); }; + // Wait for TorSettings, as we will need it. + // We will wait for a TorProvider only after TorSettings is ready, + // because the TorProviderBuilder initialization might not have finished + // at this point, and TorSettings initialization is a prerequisite for + // having a provider. + // So, we prefer initializing TorConnect as soon as possible, so that + // the UI will be able to detect it is in the Initializing state and act + // consequently. TorSettings.initializedPromise.then(() => this._settingsInitialized()); // register the Tor topics we always care about @@ -887,7 +918,7 @@ export const TorConnect = (() => { }, async observe(subject, topic, data) { - console.log(`TorConnect: Observed ${topic}`); + lazy.logger.debug(`Observed ${topic}`); switch (topic) { case TorTopics.LogHasWarnOrErr: { @@ -919,19 +950,25 @@ export const TorConnect = (() => { } }, - _settingsInitialized() { + async _settingsInitialized() { + // TODO: Handle failures here, instead of the prompt to restart the + // daemon when it exits (tor-browser#21053, tor-browser#41921). + await lazy.TorProviderBuilder.build(); + // tor-browser#41907: This is only a workaround to avoid users being // bounced back to the initial panel without any explanation. // Longer term we should disable the clickable elements, or find a UX // to prevent this from happening (e.g., allow buttons to be clicked, // but show an intermediate starting state, or a message that tor is // starting while the butons are disabled, etc...). + // See also tor-browser#41921. if (this.state !== TorConnectState.Initial) { - console.warn( - "TorConnect: Seen the torsettings:ready after the state has already changed, ignoring the notification." + lazy.logger.warn( + "The TorProvider was built after the state had already changed." ); return; } + lazy.logger.debug("The TorProvider is ready, changing state."); if (this.shouldQuickStart) { // Quickstart this._changeState(TorConnectState.Bootstrapping); @@ -1074,17 +1111,17 @@ export const TorConnect = (() => { */ beginBootstrap() { - console.log("TorConnect: beginBootstrap()"); + lazy.logger.debug("TorConnect.beginBootstrap()"); this._changeState(TorConnectState.Bootstrapping); }, cancelBootstrap() { - console.log("TorConnect: cancelBootstrap()"); + lazy.logger.debug("TorConnect.cancelBootstrap()"); this._changeState(TorConnectState.Configuring); }, beginAutoBootstrap(countryCode) { - console.log("TorConnect: beginAutoBootstrap()"); + lazy.logger.debug("TorConnect.beginAutoBootstrap()"); this._changeState(TorConnectState.AutoBootstrapping, countryCode); }, @@ -1154,7 +1191,10 @@ export const TorConnect = (() => { await mrpc.init(); this._countryCodes = await mrpc.circumvention_countries(); } catch (err) { - console.log("An error occurred while fetching country codes", err); + lazy.logger.error( + "An error occurred while fetching country codes", + err + ); } finally { mrpc.uninit(); } @@ -1187,8 +1227,8 @@ export const TorConnect = (() => { uriArray = uriVariant; } else { // about:tor as safe fallback - console.error( - `TorConnect: received unknown variant '${JSON.stringify(uriVariant)}'` + lazy.logger.error( + `Received unknown variant '${JSON.stringify(uriVariant)}'` ); uriArray = ["about:tor"]; } @@ -1209,9 +1249,7 @@ export const TorConnect = (() => { // which redirect after bootstrapping getURIsToLoad(uriVariant) { const uris = this.fixupURIs(uriVariant); - console.log( - `TorConnect: Will load after bootstrap => [${uris.join(", ")}]` - ); + lazy.logger.debug(`Will load after bootstrap => [${uris.join(", ")}]`); return uris.map(uri => this.getRedirectURL(uri)); }, }; ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -6,10 +6,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", - TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", - TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", Lox: "resource://gre/modules/Lox.sys.mjs", TorParsers: "resource://gre/modules/TorParsers.sys.mjs", + TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", }); ChromeUtils.defineLazyGetter(lazy, "logger", () => { @@ -71,20 +70,6 @@ const TorSettingsPrefs = Object.freeze({ }, }); -/* Config Keys used to configure tor daemon */ -const TorConfigKeys = Object.freeze({ - useBridges: "UseBridges", - bridgeList: "Bridge", - socks4Proxy: "Socks4Proxy", - socks5Proxy: "Socks5Proxy", - socks5ProxyUsername: "Socks5ProxyUsername", - socks5ProxyPassword: "Socks5ProxyPassword", - httpsProxy: "HTTPSProxy", - httpsProxyAuthenticator: "HTTPSProxyAuthenticator", - reachableAddresses: "ReachableAddresses", - clientTransportPlugin: "ClientTransportPlugin", -}); - export const TorBridgeSource = Object.freeze({ Invalid: -1, BuiltIn: 0, @@ -322,7 +307,7 @@ class TorSettingsImpl { if (!val) { return; } - const bridgeStrings = this.#getBuiltinBridges(val); + const bridgeStrings = this.getBuiltinBridges(val); if (bridgeStrings.length) { this.bridges.bridge_strings = bridgeStrings; return; @@ -659,14 +644,17 @@ class TorSettingsImpl { * @param {string} pt The pluggable transport to return the lines for * @returns {string[]} The bridge lines in random order */ - #getBuiltinBridges(pt) { + getBuiltinBridges(pt) { + if (!this.#allowUninitialized) { + this.#checkIfInitialized(); + } // Shuffle so that Tor Browser users do not all try the built-in bridges in // the same order. return arrayShuffle(this.#builtinBridges[pt] ?? []); } /** - * Load or init our settings, and register observers. + * Load or init our settings. */ async init() { if (this.#initialized) { @@ -677,6 +665,7 @@ class TorSettingsImpl { await this.#initInternal(); this.#initialized = true; this.#initComplete(); + Services.obs.notifyObservers(null, TorSettingsTopics.Ready); } catch (e) { this.#initFailed(e); throw e; @@ -698,45 +687,35 @@ class TorSettingsImpl { lazy.logger.error("Could not load the built-in PT config.", e); } - // Initialize this before loading from prefs because we need Lox initialized before - // any calls to Lox.getBridges() + // Initialize this before loading from prefs because we need Lox initialized + // before any calls to Lox.getBridges(). try { await lazy.Lox.init(); } catch (e) { lazy.logger.error("Could not initialize Lox.", e.type); } - // TODO: We could use a shared promise, and wait for it to be fullfilled - // instead of Service.obs. - if (lazy.TorLauncherUtil.shouldStartAndOwnTor) { - // if the settings branch exists, load settings from prefs - if (Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false)) { - // Do not want notifications for initially loaded prefs. - this.freezeNotifications(); - try { - this.#allowUninitialized = true; - this.#loadFromPrefs(); - } finally { - this.#allowUninitialized = false; - this.#notificationQueue.clear(); - this.thawNotifications(); - } - } + if ( + lazy.TorLauncherUtil.shouldStartAndOwnTor && + Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false) + ) { + // Do not want notifications for initially loaded prefs. + this.freezeNotifications(); try { - const provider = await lazy.TorProviderBuilder.build(); - if (provider.isRunning) { - this.#handleProcessReady(); - // No need to add an observer to call this again. - return; - } - } catch {} - - Services.obs.addObserver(this, lazy.TorProviderTopics.ProcessIsReady); + this.#allowUninitialized = true; + this.#loadFromPrefs(); + } finally { + this.#allowUninitialized = false; + this.#notificationQueue.clear(); + this.thawNotifications(); + } } + + lazy.logger.info("Ready"); } /** - * Unload or uninit our settings, and unregister observers. + * Unload or uninit our settings. */ async uninit() { await lazy.Lox.uninit(); @@ -764,34 +743,6 @@ class TorSettingsImpl { return this.#initialized; } - /** - * Wait for relevant life-cycle events to apply saved settings. - */ - async observe(subject, topic, data) { - lazy.logger.debug(`Observed ${topic}`); - - switch (topic) { - case lazy.TorProviderTopics.ProcessIsReady: - Services.obs.removeObserver( - this, - lazy.TorProviderTopics.ProcessIsReady - ); - await this.#handleProcessReady(); - break; - } - } - - /** - * Apply the settings once the tor provider is ready and notify any observer - * that the settings can be used. - */ - async #handleProcessReady() { - // push down settings to tor - await this.#applySettings(true); - lazy.logger.info("Ready"); - Services.obs.notifyObservers(null, TorSettingsTopics.Ready); - } - /** * Load our settings from prefs. */ @@ -972,85 +923,14 @@ class TorSettingsImpl { /** * Push our settings down to the tor provider. + * + * Even though this introduces a circular depdency, it makes the API nicer for + * frontend consumers. */ async applySettings() { this.#checkIfInitialized(); - return this.#applySettings(false); - } - - /** - * Internal implementation of applySettings that does not check if we are - * initialized. - */ - async #applySettings(allowUninitialized) { - lazy.logger.debug("#applySettings()"); - - this.#cleanupSettings(); - - const settingsMap = new Map(); - - // #applySettings can be called only when #allowUninitialized is false - this.#allowUninitialized = allowUninitialized; - - try { - /* Bridges */ - const haveBridges = - this.bridges.enabled && !!this.bridges.bridge_strings.length; - settingsMap.set(TorConfigKeys.useBridges, haveBridges); - if (haveBridges) { - settingsMap.set(TorConfigKeys.bridgeList, this.bridges.bridge_strings); - } else { - settingsMap.set(TorConfigKeys.bridgeList, null); - } - - /* Proxy */ - settingsMap.set(TorConfigKeys.socks4Proxy, null); - settingsMap.set(TorConfigKeys.socks5Proxy, null); - settingsMap.set(TorConfigKeys.socks5ProxyUsername, null); - settingsMap.set(TorConfigKeys.socks5ProxyPassword, null); - settingsMap.set(TorConfigKeys.httpsProxy, null); - settingsMap.set(TorConfigKeys.httpsProxyAuthenticator, null); - if (this.proxy.enabled) { - const address = this.proxy.address; - const port = this.proxy.port; - const username = this.proxy.username; - const password = this.proxy.password; - - switch (this.proxy.type) { - case TorProxyType.Socks4: - settingsMap.set(TorConfigKeys.socks4Proxy, `${address}:${port}`); - break; - case TorProxyType.Socks5: - settingsMap.set(TorConfigKeys.socks5Proxy, `${address}:${port}`); - settingsMap.set(TorConfigKeys.socks5ProxyUsername, username); - settingsMap.set(TorConfigKeys.socks5ProxyPassword, password); - break; - case TorProxyType.HTTPS: - settingsMap.set(TorConfigKeys.httpsProxy, `${address}:${port}`); - settingsMap.set( - TorConfigKeys.httpsProxyAuthenticator, - `${username}:${password}` - ); - break; - } - } - - /* Firewall */ - if (this.firewall.enabled) { - const reachableAddresses = this.firewall.allowed_ports - .map(port => `*:${port}`) - .join(","); - settingsMap.set(TorConfigKeys.reachableAddresses, reachableAddresses); - } else { - settingsMap.set(TorConfigKeys.reachableAddresses, null); - } - } finally { - this.#allowUninitialized = false; - } - - /* Push to Tor */ const provider = await lazy.TorProviderBuilder.build(); - await provider.writeSettings(settingsMap); + await provider.writeSettings(this.getSettings()); } /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f6c7b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f6c7b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.0-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: eaa8c377 by Pier Angelo Vendrame at 2024-03-11T15:53:55+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - 63219c0c by Pier Angelo Vendrame at 2024-03-11T15:53:56+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -641,7 +641,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.0-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: f251f057 by Pier Angelo Vendrame at 2024-03-11T15:53:27+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - 479be760 by Pier Angelo Vendrame at 2024-03-11T15:53:29+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -643,7 +643,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/63c89d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/63c89d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.0-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Mar '24

11 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 9a246151 by Pier Angelo Vendrame at 2024-03-11T15:52:04+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - 6bbacc00 by Pier Angelo Vendrame at 2024-03-11T15:52:13+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -643,7 +643,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/572c0b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/572c0b… 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 41102: Compress firefox source tarball in a container
by boklm (＠boklm) 11 Mar '24

11 Mar '24

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: c73503ae by Nicolas Vigier at 2024-03-11T15:48:23+01:00 Bug 41102: Compress firefox source tarball in a container As the xz version on the host can be different and produce different output, we compress the firefox source tarball inside a container. At the same time we use xz's --threads option to make compression faster by using multiple threads. We also move the src-tarballs step definition from rbm.conf to projects/firefox/config since it's not used in any other project. - - - - - 3 changed files: - projects/firefox/config - projects/release/config - rbm.conf Changes: ===================================== projects/firefox/config ===================================== @@ -58,9 +58,25 @@ steps: src-tarballs: filename: 'src-[% project %]-[% c("version") %].tar.xz' version: '[% c("git_hash") %]' - input_files: [] + input_files: + - project: container-image + pkg_type: build + compress_tar: '' container: - use_container: 0 + use_container: 1 + var: + # single-thread and multi-thread xz will generate a different result, + # se we use at least 2 threads + xz_threads: '[% c("num_procs") == "1" ? "2" : c("num_procs") %]' + src-tarballs: | + #!/bin/bash + set -e + mkdir -p '[% dest_dir %]' + # Files copied to the container are owned by group root (rbm#40074), + # and it seems xz doesn't like that and exits with an error + chgrp rbm '[% project %]-[% c("version") %].tar' + xz --threads=[% c("var/xz_threads") %] -f '[% project %]-[% c("version") %].tar' + mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' targets: nightly: version: '[% c("abbrev") %]' ===================================== projects/release/config ===================================== @@ -229,8 +229,7 @@ input_files: pkg_type: src-tarballs target: - '[% c("var/build_target") %]' - - browser-src - - '[% c("var/browser_type") %]' + - '[% c("var/browser_type") %]-macos' steps: signtag: ===================================== rbm.conf ===================================== @@ -14,14 +14,6 @@ container: build: 1 steps: - src-tarballs: - compress_tar: xz - src-tarballs: | - #!/bin/bash - set -e - mkdir -p '[% dest_dir %]' - mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' - list_toolchain_updates: build_log: '-' list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- 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/tor-browser-build][main] Bug 41102: Compress firefox source tarball in a container
by boklm (＠boklm) 11 Mar '24

11 Mar '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5e9f8f0c by Nicolas Vigier at 2024-03-11T15:47:20+01:00 Bug 41102: Compress firefox source tarball in a container As the xz version on the host can be different and produce different output, we compress the firefox source tarball inside a container. At the same time we use xz's --threads option to make compression faster by using multiple threads. We also move the src-tarballs step definition from rbm.conf to projects/firefox/config since it's not used in any other project. - - - - - 3 changed files: - projects/firefox/config - projects/release/config - rbm.conf Changes: ===================================== projects/firefox/config ===================================== @@ -58,9 +58,25 @@ steps: src-tarballs: filename: 'src-[% project %]-[% c("version") %].tar.xz' version: '[% c("git_hash") %]' - input_files: [] + input_files: + - project: container-image + pkg_type: build + compress_tar: '' container: - use_container: 0 + use_container: 1 + var: + # single-thread and multi-thread xz will generate a different result, + # se we use at least 2 threads + xz_threads: '[% c("num_procs") == "1" ? "2" : c("num_procs") %]' + src-tarballs: | + #!/bin/bash + set -e + mkdir -p '[% dest_dir %]' + # Files copied to the container are owned by group root (rbm#40074), + # and it seems xz doesn't like that and exits with an error + chgrp rbm '[% project %]-[% c("version") %].tar' + xz --threads=[% c("var/xz_threads") %] -f '[% project %]-[% c("version") %].tar' + mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' targets: nightly: version: '[% c("abbrev") %]' ===================================== projects/release/config ===================================== @@ -229,8 +229,7 @@ input_files: pkg_type: src-tarballs target: - '[% c("var/build_target") %]' - - browser-src - - '[% c("var/browser_type") %]' + - '[% c("var/browser_type") %]-macos' steps: signtag: ===================================== rbm.conf ===================================== @@ -14,14 +14,6 @@ container: build: 1 steps: - src-tarballs: - compress_tar: xz - src-tarballs: | - #!/bin/bash - set -e - mkdir -p '[% dest_dir %]' - mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' - list_toolchain_updates: build_log: '-' list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

07 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f6c7b7f2 by Henry Wilkes at 2024-03-07T11:46:58+00:00 fixup! Add TorStrings module for localization Bug 42442: Remove unused bridge settings strings. - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -96,32 +96,3 @@ settings.allowedPortsPlaceholder=Comma-separated values # Log dialog settings.torLogDialogTitle=Tor Logs settings.copyLog=Copy Tor Log to Clipboard - - -# TODO: Remove - -settings.bridgeCurrent=Your Current Bridges -settings.bridgeCurrentDescription=You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed. -# Translation note: %1$S = bridge type; %2$S = bridge emoji id -settings.bridgeId=%1$S bridge: %2$S -settings.connectedBridge=Connected -settings.bridgeShare=Share this bridge using the QR code or by copying its address: -settings.whatAreThese=What are these? -settings.bridgeCopy=Copy Bridge Address -settings.bridgeShowAll=Show All Bridges -settings.bridgeShowFewer=Show Fewer Bridges -settings.allBridgesEnabled=Use current bridges -settings.bridgeRemoveAll=Remove All Bridges -settings.bridgeAdd=Add a New Bridge -settings.bridgeSelectBrowserBuiltin=Choose from one of Tor Browser’s built-in bridges -settings.bridgeSelectBuiltin=Select a Built-In Bridge… -settings.bridgeRequestFromTorProject=Request a bridge from torproject.org -settings.bridgeRequest=Request a Bridge… -settings.bridgeEnterKnown=Enter a bridge address you already know -settings.bridgeAddManually=Add a Bridge Manually… - -# Provide bridge dialog -settings.provideBridgeTitleAdd=Add a Bridge Manually -# Translation note: %S is a Learn more link. -settings.provideBridgeDescription=Add a bridge provided by a trusted organization or someone you know. If you don’t have a bridge, you can request one from the Tor Project. %S -settings.provideBridgePlaceholder=type address:port (one per line) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f6c7b7f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f6c7b7f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 3 commits: fixup! Tor Browser localization migration scripts.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 708a2c47 by Henry Wilkes at 2024-03-07T10:37:42+00:00 fixup! Tor Browser localization migration scripts. Bug 42305: Move localization scripts into new folder. - - - - - ad71ddb2 by Henry Wilkes at 2024-03-07T10:37:42+00:00 Bug 42305: Add script to combine translation files across versions. - - - - - f13a9d22 by Henry Wilkes at 2024-03-07T10:37:42+00:00 Add CI for Tor Browser - - - - - 13 changed files: - + .gitlab-ci.yml - + tools/torbrowser/l10n/combine-translation-versions.py - + tools/torbrowser/l10n/combine/__init__.py - + tools/torbrowser/l10n/combine/combine.py - + tools/torbrowser/l10n/combine/tests/README - tools/torbrowser/l10n_migrations/__init__.py → tools/torbrowser/l10n/combine/tests/__init__.py - + tools/torbrowser/l10n/combine/tests/test_android.py - + tools/torbrowser/l10n/combine/tests/test_dtd.py - + tools/torbrowser/l10n/combine/tests/test_fluent.py - + tools/torbrowser/l10n/combine/tests/test_properties.py - tools/torbrowser/migrate_l10n.py → tools/torbrowser/l10n/migrate.py - + tools/torbrowser/l10n/migrations/__init__.py - tools/torbrowser/l10n_migrations/bug-41333-new-about-tor.py → tools/torbrowser/l10n/migrations/bug-41333-new-about-tor.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -0,0 +1,69 @@ +stages: + - update-translations + +.update-translation-base: + stage: update-translations + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - "**/*.ftl" + - "**/*.properties" + - "**/*.dtd" + - if: $FORCE_UPDATE_TRANSLATIONS == "true" + variables: + TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json" + + +combine-en-US-translations: + extends: .update-translation-base + image: python + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + TRANSLATION_FILES: ' + tor-browser:tor-browser.ftl + tor-browser:aboutDialog.dtd + tor-browser:aboutTBUpdate.dtd + tor-browser:aboutTor.dtd + tor-browser:torbutton.dtd + tor-browser:browserOnboarding.properties + tor-browser:cryptoSafetyPrompt.properties + tor-browser:onboarding.properties + tor-browser:onionLocation.properties + tor-browser:rulesets.properties + tor-browser:settings.properties + tor-browser:torbutton.properties + tor-browser:torConnect.properties + tor-browser:torlauncher.properties + base-browser:base-browser.ftl + base-browser:newIdentity.properties + base-browser:securityLevel.properties + ' + cache: + paths: + - .cache/pip + # Artifact is for translation project job + artifacts: + paths: + - "$TOR_BROWSER_COMBINED_FILES_JSON" + expire_in: "60 min" + reports: + dotenv: job_id.env + # Don't load artifacts for this job. + dependencies: [] + script: + # Save this CI_JOB_ID to the dotenv file to be used in the variables for the + # push-en-US-translations job. + - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env + - pip install compare_locales + - python ./tools/torbrowser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$TOR_BROWSER_COMBINED_FILES_JSON" + +push-en-US-translations: + extends: .update-translation-base + needs: + - job: combine-en-US-translations + variables: + TOR_BROWSER_COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${TOR_BROWSER_COMBINED_FILES_JSON}" + trigger: + strategy: depend + project: tor-browser-translation-bot/translation + branch: tor-browser-ci ===================================== tools/torbrowser/l10n/combine-translation-versions.py ===================================== @@ -0,0 +1,208 @@ +import argparse +import json +import logging +import os +import re +import subprocess + +from combine import combine_files + +arg_parser = argparse.ArgumentParser( + description="Combine a translation file across two different versions" +) + +arg_parser.add_argument( + "current_branch", metavar="<current-branch>", help="branch for the newest version" +) +arg_parser.add_argument( + "filenames", metavar="<filenames>", help="name of the translation files" +) +arg_parser.add_argument("outname", metavar="<json>", help="name of the json output") + +args = arg_parser.parse_args() + +logging.basicConfig() +logger = logging.getLogger("combine-translation-versions") +logger.setLevel(logging.INFO) + + +def in_pink(msg: str) -> str: + """Present a message as pink in the terminal output. + + :param msg: The message to wrap in pink. + :returns: The message to print to terminal. + """ + # Pink and bold. + return f"\x1b[1;38;5;212m{msg}\x1b[0m" + + +def git_run(git_args: list[str]) -> None: + """Run a git command. + + :param git_args: The arguments that should follow "git". + """ + # Add some text to give context to git's stderr appearing in log. + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + subprocess.run(["git", *git_args], check=True) + + +def git_text(git_args: list[str]) -> str: + """Get the text output for a git command. + + :param git_args: The arguments that should follow "git". + :returns: The stdout of the command. + """ + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + return subprocess.run( + ["git", *git_args], text=True, check=True, stdout=subprocess.PIPE + ).stdout + + +def git_lines(git_args: list[str]) -> list[str]: + """Get the lines from a git command. + + :param git_args: The arguments that should follow "git". + :returns: The non-empty lines from stdout of the command. + """ + return [line for line in git_text(git_args).split("\n") if line] + + +def git_file_paths(git_ref: str) -> list[str]: + """Get the full list of file paths found under the given tree. + + :param git_ref: The git reference for the tree to search. + :returns: The found file paths. + """ + return git_lines(["ls-tree", "-r", "--format=%(path)", git_ref]) + + +def matching_path(search_paths: list[str], filename: str) -> str | None: + """Get the matching file path with the given filename, if it exists. + + :param search_paths: The file paths to search through. + :param filename: The file name to match. + :returns: The unique file path with the matching name, or None if no such + match was found. + :throws Exception: If multiple paths shared the same file name. + """ + matching = [path for path in search_paths if os.path.basename(path) == filename] + if not matching: + return None + if len(matching) > 1: + raise Exception("Multiple occurrences of {filename}") + return matching[0] + + +def git_file_content(git_ref: str, path: str | None) -> str | None: + """Get the file content of the specified git blob object. + + :param git_ref: The reference for the tree to find the file under. + :param path: The file path for the object, or None if there is no path. + :returns: The file content, or None if no path was given. + """ + if path is None: + return None + return git_text(["cat-file", "blob", f"{git_ref}:{path}"]) + + +def get_stable_branch(branch_prefix: str) -> str: + """Find the most recent stable branch in the origin repository. + + :param branch_prefix: The prefix that the stable branch should have. + :returns: The branch name. + """ + tag_glob = f"{branch_prefix}-*-build1" + # To speed up, only fetch the tags without blobs. + git_run( + ["fetch", "--depth=1", "--filter=object:type=tag", "origin", "tag", tag_glob] + ) + # Get most recent stable tag. + for build_tag, annotation in ( + line.split(" ", 1) + for line in git_lines(["tag", "-n1", "--list", tag_glob, "--sort=-taggerdate"]) + ): + if "stable" in annotation: + # Branch name is the same as the tag, minus "-build1". + return re.sub(r"-build1$", "", build_tag) + raise Exception("No stable build1 tag found") + + +def get_version_from_branch_name(branch_name: str) -> tuple[str, float]: + """Get the branch prefix and version from its name. + + :param branch_name: The branch to extract from. + :returns: The branch prefix and its version number. + """ + version_match = re.match( + r"([a-z-]+)-[^-]*-([0-9]+\.[05])-", + branch_name, + ) + + if not version_match: + raise ValueError(f"Unable to parse the version from the branch {branch_name}") + + return (version_match.group(1), float(version_match.group(2))) + + +branch_prefix, current_version = get_version_from_branch_name(args.current_branch) + +stable_branch = get_stable_branch(branch_prefix) +_, stable_version = get_version_from_branch_name(stable_branch) + +if stable_version > current_version or stable_version < current_version - 0.5: + raise Exception( + f"Version of stable branch {stable_branch} is not within 0.5 of the " + f"current branch {args.current_branch}" + ) + +# Minimal fetch of stable_branch. +# Individual file blobs will be downloaded as needed. +git_run(["fetch", "--depth=1", "--filter=blob:none", "origin", stable_branch]) + +current_file_paths = git_file_paths("HEAD") +old_file_paths = git_file_paths(f"origin/{stable_branch}") + +ci_commit = os.environ.get("CI_COMMIT_SHA", "") +ci_url_base = os.environ.get("CI_PROJECT_URL", "") + +json_data = { + "commit": ci_commit, + "commit-url": f"{ci_url_base}/-/commit/{ci_commit}" + if (ci_commit and ci_url_base) + else "", + "project-path": os.environ.get("CI_PROJECT_PATH", ""), + "current-branch": args.current_branch, + "stable-branch": stable_branch, + "files": [], +} + +for translation_branch, name in ( + part.strip().split(":", 1) for part in args.filenames.split(" ") if part.strip() +): + current_path = matching_path(current_file_paths, name) + old_path = matching_path(old_file_paths, name) + + if current_path is None and old_path is None: + # No file in either branch. + logger.warning(f"{name} does not exist in either the current or stable branch") + elif current_path is None: + logger.warning(f"{name} deleted in the current branch") + elif old_path is None: + logger.warning(f"{name} does not exist in the stable branch") + + content = combine_files( + name, + git_file_content("HEAD", current_path), + git_file_content(f"origin/{stable_branch}", old_path), + f"Will be unused in Tor Browser {current_version}!", + ) + json_data["files"].append( + { + "name": name, + "branch": translation_branch, + "content": content, + } + ) + +with open(args.outname, "w") as file: + json.dump(json_data, file) ===================================== tools/torbrowser/l10n/combine/__init__.py ===================================== @@ -0,0 +1,3 @@ +# flake8: noqa + +from .combine import combine_files ===================================== tools/torbrowser/l10n/combine/combine.py ===================================== @@ -0,0 +1,181 @@ +import re +from typing import TYPE_CHECKING, Any + +from compare_locales.parser import getParser +from compare_locales.parser.android import AndroidEntity, DocumentWrapper +from compare_locales.parser.base import Comment, Entity, Junk, Whitespace +from compare_locales.parser.dtd import DTDEntity +from compare_locales.parser.fluent import FluentComment, FluentEntity +from compare_locales.parser.properties import PropertiesEntity + +if TYPE_CHECKING: + from collections.abc import Iterable + + +def combine_files( + filename: str, + new_content: str | None, + old_content: str | None, + comment_prefix: str, +) -> str | None: + """Combine two translation files into one to include all strings from both. + The new content is presented first, and any strings only found in the old + content are placed at the end with an additional comment. + + :param filename: The filename for the file, determines the format. + :param new_content: The new content for the file, or None if it has been + deleted. + :param old_content: The old content for the file, or None if it did not + exist before. + :comment_prefix: A comment to include for any strings that are only found in + the old content. This will be placed before any other comments for the + string. + + :returns: The combined content, or None if both given contents are None. + """ + if new_content is None and old_content is None: + return None + + # getParser from compare_locale returns the same instance for the same file + # extension. + parser = getParser(filename) + + is_android = filename.endswith(".xml") + if new_content is None: + if is_android: + # File was deleted, add some document parts. + content_start = ( + '<?xml version="1.0" encoding="utf-8" standalone="yes"?>\n<resources>\n' + ) + content_end = "</resources>\n" + else: + # Treat as an empty file. + content_start = "" + content_end = "" + existing_keys = [] + else: + parser.readUnicode(new_content) + + # Start with the same content as the current file. + # For android strings, we want to keep the final "</resources>" until after. + if is_android: + closing_match = re.match( + r"^(.*)(</resources>\s*)$", parser.ctx.contents, re.DOTALL + ) + if not closing_match: + raise ValueError("Missing a final </resources>") + content_start = closing_match.group(1) + content_end = closing_match.group(2) + else: + content_start = parser.ctx.contents + content_end = "" + existing_keys = [entry.key for entry in parser.walk(only_localizable=True)] + + # For Fluent, we want to prefix the strings using GroupComments. + # On weblate this will cause all the strings that fall under the GroupComment's + # scope to have the prefix added to their "notes". + # We set up an initial GroupComment for the first string we find. This will also + # end the scope of the last GroupComment in the new translation file. + # This will be replaced with a the next GroupComment when it is found. + fluent_group_comment_prefix = f"\n## {comment_prefix}\n" + fluent_group_comment: str | None = fluent_group_comment_prefix + + # For other formats, we want to keep all the comment lines that come directly + # before the string. + # In compare_locales.parser, only the comment line directly before an Entity + # counts as the pre_comment for that Entity. I.e. only this line will be + # included in Entity.all + # However, in weblate every comment line that comes before the Entity is + # included as a comment. So we also want to keep these additional comments to + # preserve them for weblate. + # We gather these extra comments in stacked_comments, and clear them whenever we + # reach an Entity or a blank line (Whitespace is more than "\n"). + stacked_comments: list[str] = [] + + additions: list[str] = [] + + entry_iter: Iterable[Any] = () + # If the file does not exist in the old branch, don't make any additions. + if old_content is not None: + parser.readUnicode(old_content) + entry_iter = parser.walk(only_localizable=False) + for entry in entry_iter: + if isinstance(entry, Junk): + raise ValueError(f"Unexpected Junk: {entry.all}") + if isinstance(entry, Whitespace): + # Clear stacked comments if more than one empty line. + if entry.all != "\n": + stacked_comments.clear() + continue + if isinstance(entry, Comment): + if isinstance(entry, FluentComment): + # Don't stack Fluent comments. + # Only the comments included in Entity.pre_comment count towards + # that Entity's comment. + if entry.all.startswith("##"): + # A Fluent GroupComment + if entry.all == "##": + # Empty GroupComment. Used to end the scope of a previous + # GroupComment. + # Replace this with our prefix comment. + fluent_group_comment = fluent_group_comment_prefix + else: + # Prefix the group comment. + fluent_group_comment = ( + f"{fluent_group_comment_prefix}{entry.all}\n" + ) + else: + stacked_comments.append(entry.all) + continue + if isinstance(entry, DocumentWrapper): + # Not needed. + continue + + if not isinstance(entry, Entity): + raise ValueError(f"Unexpected type: {entry.__class__.__name__}") + + if entry.key in existing_keys: + # Already included this string in the new translation file. + # Drop the gathered comments for this Entity. + stacked_comments.clear() + continue + + if isinstance(entry, FluentEntity): + if fluent_group_comment is not None: + # We have a found GroupComment which has not been included yet. + # All following Entity's will be under its scope, until the next + # GroupComment. + additions.append(fluent_group_comment) + # Added GroupComment, so don't need to add again. + fluent_group_comment = None + elif isinstance(entry, DTDEntity): + # Include our additional comment before we print the rest for this + # Entity. + additions.append(f"") + elif isinstance(entry, PropertiesEntity): + additions.append(f"# {comment_prefix}") + elif isinstance(entry, AndroidEntity): + additions.append(f"") + else: + raise ValueError(f"Unexpected Entity type: {entry.__class__.__name__}") + + # Add any other comment lines that came directly before this Entity. + additions.extend(stacked_comments) + stacked_comments.clear() + additions.append(entry.all) + + content_middle = "" + + if additions: + # New line before and after the additions + additions.insert(0, "") + additions.append("") + if is_android: + content_middle = "\n ".join(additions) + else: + content_middle = "\n".join(additions) + + # Remove " " in otherwise blank lines. + content_middle = re.sub("^ +$", "", content_middle, flags=re.MULTILINE) + + return content_start + content_middle + content_end ===================================== tools/torbrowser/l10n/combine/tests/README ===================================== @@ -0,0 +1,2 @@ +python tests to be run with pytest. +Requires the compare-locales package. ===================================== tools/torbrowser/l10n_migrations/__init__.py → tools/torbrowser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/test_android.py ===================================== @@ -0,0 +1,330 @@ +import textwrap + +from combine import combine_files + + +def wrap_in_xml(content): + if content is None: + return None + # Allow for indents to make the tests more readable. + content = textwrap.dedent(content) + return f"""\ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +{textwrap.indent(content, " ")}</resources> +""" + + +def assert_result(new_content, old_content, expect): + new_content = wrap_in_xml(new_content) + old_content = wrap_in_xml(old_content) + expect = wrap_in_xml(expect) + assert expect == combine_files( + "test_strings.xml", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + +  + <string name="string_1">First</string> +  + <string name="string_2">Second</string> + """, + ) + + +def test_no_change(): + content = """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  + <string name="removed">REMOVED</string> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed_1">First removed</string> + <string name="removed_2">Second removed</string> + <string name="string_2">Second</string> + <string name="removed_3">Third removed</string> + """, + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + +  + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> +  + <string name="removed_3">Third removed</string> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <string name="changed_string">NEW</string> + """, + """\ + <string name="changed_string">OLD</string> + """, + """\ + <string name="changed_string">NEW</string> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment added. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment removed. + assert_result( + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + ) + + # With file comments + assert_result( + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + ) + + +def test_reordered(): + # String was re_ordered. + assert_result( + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + """\ + <string name="moved_string">move</string> + <string name="string_1">value</string> + """, + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> +  + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  +  + <string name="removed">REMOVED</string> + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> + +  + +  +  + <string name="removed_3">Third removed</string> + +  +  + + <string name="removed_4">Fourth removed</string> + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + +  + <string name="removed_1">First removed</string> +  +  + <string name="removed_2">Second removed</string> +  +  +  + <string name="removed_3">Third removed</string> +  + <string name="removed_4">Fourth removed</string> + """, + ) ===================================== tools/torbrowser/l10n/combine/tests/test_dtd.py ===================================== @@ -0,0 +1,325 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.dtd", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + +  + <!ENTITY string.1 "First"> +  + <!ENTITY string.2 "Second"> + """, + ) + + +def test_no_change(): + content = """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed "REMOVED"> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> + <!ENTITY removed.2 "Second removed"> + <!ENTITY string.2 "Second"> + <!ENTITY removed.3 "Third removed"> + """, + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + +  + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> +  + <!ENTITY removed.3 "Third removed"> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <!ENTITY changed.string "NEW"> + """, + """\ + <!ENTITY changed.string "OLD"> + """, + """\ + <!ENTITY changed.string "NEW"> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment added. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment removed. + assert_result( + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + ) + + # With multiple comments + assert_result( + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + """\ + <!ENTITY moved.string "move"> + <!ENTITY string.1 "value"> + """, + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> +  + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  +  + <!ENTITY removed "REMOVED"> + """, + ) + + # With multiple lines of comments. + + assert_result( + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + """, + """\ +  + +  + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> + +  + +  +  + <!ENTITY removed.3 "Third removed"> + +  + + <!ENTITY removed.4 "Fourth removed"> + <!ENTITY string.2 "Second"> + """, + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed.1 "First removed"> +  +  + <!ENTITY removed.2 "Second removed"> +  +  +  + <!ENTITY removed.3 "Third removed"> +  + <!ENTITY removed.4 "Fourth removed"> + """, + ) ===================================== tools/torbrowser/l10n/combine/tests/test_fluent.py ===================================== @@ -0,0 +1,344 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.ftl", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string-1 = First + string-2 = Second + """, + None, + """\ + string-1 = First + string-2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string-1 = First + string-2 = Second + """, + """\ + + + ## REMOVED STRING + + string-1 = First + string-2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string-1 = First + string-2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + removed = REMOVED + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + """, + """\ + string-1 = + .attr = First + removed-1 = First removed + removed-2 = + .attr = Second removed + string-2 = Second + removed-3 = Third removed + """, + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + + + ## REMOVED STRING + + removed-1 = First removed + removed-2 = + .attr = Second removed + removed-3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed-string = NEW + """, + """\ + changed-string = OLD + """, + """\ + changed-string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + changed-string = string + """, + ) + + # With group comments. + assert_result( + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + """\ + ## GROUP OLD + + # OLD + changed-string = string + """, + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + ) + + +def test_reordered(): + # String was re-ordered. + assert_result( + """\ + string-1 = value + moved-string = move + """, + """\ + moved-string = move + string-1 = value + """, + """\ + string-1 = value + moved-string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string-1 = First + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + # Comment for removed. + removed = REMOVED + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + # Comment for removed. + removed = REMOVED + """, + ) + + # Group comments are combined with the "REMOVED STRING" comments. + # If strings have no group comment, then a single "REMOVED STRING" is + # included for them. + assert_result( + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## + + no-group = No group comment + removed-3 = Third removed + + ## Second + ## Group comment + + removed-4 = Fourth removed + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + + + ## REMOVED STRING + ## First Group comment + + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## REMOVED STRING + + removed-3 = Third removed + + ## REMOVED STRING + ## Second + ## Group comment + + removed-4 = Fourth removed + """, + ) ===================================== tools/torbrowser/l10n/combine/tests/test_properties.py ===================================== @@ -0,0 +1,322 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.properties", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string.1 = First + string.2 = Second + """, + None, + """\ + string.1 = First + string.2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string.1 = First + string.2 = Second + """, + """\ + + # REMOVED STRING + string.1 = First + # REMOVED STRING + string.2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string.1 = First + string.2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + removed = REMOVED + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + + # REMOVED STRING + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + """, + """\ + string.1 = First + removed.1 = First removed + removed.2 = Second removed + string.2 = Second + removed.3 = Third removed + """, + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + removed.2 = Second removed + # REMOVED STRING + removed.3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed.string = NEW + """, + """\ + changed.string = OLD + """, + """\ + changed.string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + changed.string = string + """, + ) + + # With file comments + assert_result( + """\ + # NEW file comment + + # NEW + changed.string = string + """, + """\ + # OLD file comment + + # OLD + changed.string = string + """, + """\ + # NEW file comment + + # NEW + changed.string = string + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + string.1 = value + moved.string = move + """, + """\ + moved.string = move + string.1 = value + """, + """\ + string.1 = value + moved.string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string.1 = First + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + # Comment for removed. + removed = REMOVED + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + string.2 = Second + + # REMOVED STRING + # Comment for removed. + removed = REMOVED + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + removed.1 = First removed + # Comment for second removed. + removed.2 = Second removed + + # Removed file comment + + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + + # Second + # File comment + + removed.4 = Fourth removed + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + # Comment for second removed. + removed.2 = Second removed + # REMOVED STRING + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + # REMOVED STRING + removed.4 = Fourth removed + """, + ) ===================================== tools/torbrowser/migrate_l10n.py → tools/torbrowser/l10n/migrate.py ===================================== ===================================== tools/torbrowser/l10n/migrations/__init__.py ===================================== ===================================== tools/torbrowser/l10n_migrations/bug-41333-new-about-tor.py → tools/torbrowser/l10n/migrations/bug-41333-new-about-tor.py ===================================== View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a014a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a014a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 1b9657fb by Pier Angelo Vendrame at 2024-03-07T10:46:47+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 12b60a12 by Pier Angelo Vendrame at 2024-03-07T10:46:11+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/12b60a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/12b60a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a014a0e0 by Pier Angelo Vendrame at 2024-03-07T10:44:55+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a014a0e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a014a0e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 42438 (TB): Export the original $HOME on Linux.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 14d5ad27 by Pier Angelo Vendrame at 2024-03-06T18:47:08+00:00 Bug 42438 (TB): Export the original $HOME on Linux. We need it for the migration wizard (e.g., to import bookmarks). - - - - - 1 changed file: - projects/browser/RelativeLink/start-browser Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -254,6 +254,7 @@ if [ "$register_desktop_app" -eq -1 ]; then exit 0 fi +export BB_ORIGINAL_HOME="$HOME" HOME="${PWD}" export HOME View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 6da931f7 by hackademix at 2024-03-06T22:12:22+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6da… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6da… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 1564281f by hackademix at 2024-03-06T22:10:59+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1564281… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1564281… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 03dbfffc by hackademix at 2024-03-06T22:06:28+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03dbfff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03dbfff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 3 commits: fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by richard (＠richard) 06 Mar '24

06 Mar '24

richard pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ba957be4 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 42437: Drop "torbrowser.version" pref. - - - - - cba03e79 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 42437: Drop "torbrowser.version" pref. - - - - - f44e1549 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 12620: TorBrowser regression tests Bug 42437: Drop "torbrowser.version" pref. - - - - - 3 changed files: - browser/app/profile/000-tor-browser.js - browser/components/abouttor/AboutTorMessage.sys.mjs - tbb-tests/browser_tor_TB4.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -46,8 +46,6 @@ pref("network.http.http3.enable", false); // 0 = do not use a second connection, see all.js and #7656 pref("network.http.connection-retry-timeout", 0); -#expand pref("torbrowser.version", __BASE_BROWSER_VERSION_QUOTED__); - // Tor Browser used to be compatible with non-Tor proxies. This feature is not // available anymore, but this legacy preference can be still used to disable // first-party domain circuit isolation. ===================================== browser/components/abouttor/AboutTorMessage.sys.mjs ===================================== @@ -27,7 +27,9 @@ export const AboutTorMessage = { if (Services.prefs.getBoolPref(shouldNotifyPref, false)) { Services.prefs.clearUserPref(shouldNotifyPref); return { - updateVersion: Services.prefs.getCharPref("torbrowser.version"), + updateVersion: Services.prefs.getCharPref( + "browser.startup.homepage_override.torbrowser.version" + ), updateURL: Services.prefs.getCharPref("torbrowser.post_update.url", "") || Services.urlFormatter.formatURLPref("startup.homepage_override_url"), ===================================== tbb-tests/browser_tor_TB4.js ===================================== @@ -11,9 +11,6 @@ let expectedPrefs = [ // Disable the "Refresh" prompt that is displayed for stale profiles. ["browser.disableResetPrompt", true], - - // Version placeholder - ["torbrowser.version", "dev-build"], ]; let getPref = function (prefName) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12e3f7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12e3f7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 2 commits: fixup! MB 39: Add home page about:mullvad-browser
by richard (＠richard) 06 Mar '24

06 Mar '24

richard pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 17a59ab8 by Henry Wilkes at 2024-03-06T18:38:37+00:00 fixup! MB 39: Add home page about:mullvad-browser Bug 271: Show update in about:mullvad-browser - - - - - f7da4302 by Henry Wilkes at 2024-03-06T18:38:37+00:00 fixup! MB 112: Updater customization for Mullvad Browser Bug 271: Do not open update override page in a new tab, and show in about:mullvad-browser instead. - - - - - 11 changed files: - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - browser/components/mullvad-browser/jar.mn - browser/components/mullvad-browser/moz.build - browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -666,6 +666,23 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against + // about:mullvad-browser to decide whether or not we need an override page + // (second tab) after an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) { + startPage = lazy.HomePage.get(); + } + } catch (e) { + console.error(e); + } + + if (startPage == "about:blank") { + startPage = ""; + } + var override; var overridePage = ""; var additionalPage = ""; @@ -734,6 +751,17 @@ nsBrowserContentHandler.prototype = { "%OLD_BASE_BROWSER_VERSION%", old_forkVersion ); + if (overridePage && AppConstants.BASE_BROWSER_UPDATE) { + // Mullvad Browser, copied from tor-browser: Instead of opening + // the post-update "override page" directly, we include a link in + // about:mullvad-browser. + prefb.setCharPref("mullvadbrowser.post_update.url", overridePage); + prefb.setBoolPref("mullvadbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + overridePage = startPage === "about:mullvad-browser" ? "" : "about:mullvad-browser"; + } break; case OVERRIDE_NEW_BUILD_ID: if (lazy.UpdateManager.readyUpdate) { @@ -806,20 +834,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) { - startPage = lazy.HomePage.get(); - } - } catch (e) { - console.error(e); - } - - if (startPage == "about:blank") { - startPage = ""; - } - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -370,6 +370,20 @@ let JSWINDOWACTORS = { matches: ["about:messagepreview", "about:messagepreview?*"], }, + AboutMullvadBrowser: { + parent: { + esModuleURI: "resource:///actors/AboutMullvadBrowserParent.sys.mjs", + }, + child: { + esModuleURI: "resource:///actors/AboutMullvadBrowserChild.sys.mjs", + events: { + DOMContentLoaded: {}, + }, + }, + + matches: ["about:mullvad-browser"], + }, + AboutPlugins: { parent: { esModuleURI: "resource:///actors/AboutPluginsParent.sys.mjs", ===================================== browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs ===================================== @@ -0,0 +1,14 @@ +export class AboutMullvadBrowserChild extends JSWindowActorChild { + handleEvent(event) { + switch (event.type) { + case "DOMContentLoaded": + this.sendQuery("AboutMullvadBrowser:GetUpdateData").then(data => { + const updateEvent = new this.contentWindow.CustomEvent("UpdateData", { + detail: Cu.cloneInto(data, this.contentWindow), + }); + this.contentWindow.dispatchEvent(updateEvent); + }); + break; + } + } +} ===================================== browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs ===================================== @@ -0,0 +1,23 @@ +export class AboutMullvadBrowserParent extends JSWindowActorParent { + receiveMessage(message) { + const shouldNotifyPref = "mullvadbrowser.post_update.shouldNotify"; + switch (message.name) { + case "AboutMullvadBrowser:GetUpdateData": + if (!Services.prefs.getBoolPref(shouldNotifyPref, false)) { + return Promise.resolve(null); + } + Services.prefs.clearUserPref(shouldNotifyPref); + return Promise.resolve({ + version: Services.prefs.getCharPref( + "browser.startup.homepage_override.mullvadbrowser.version" + ), + url: + Services.prefs.getCharPref("mullvadbrowser.post_update.url", "") || + Services.urlFormatter.formatURLPref( + "startup.homepage_override_url" + ), + }); + } + return undefined; + } +} ===================================== browser/components/mullvad-browser/content/2728-sparkles.svg ===================================== @@ -0,0 +1,3 @@ + +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M34.347 16.893l-8.899-3.294-3.323-10.891c-.128-.42-.517-.708-.956-.708-.439 0-.828.288-.956.708l-3.322 10.891-8.9 3.294c-.393.146-.653.519-.653.938 0 .418.26.793.653.938l8.895 3.293 3.324 11.223c.126.424.516.715.959.715.442 0 .833-.291.959-.716l3.324-11.223 8.896-3.293c.391-.144.652-.518.652-.937 0-.418-.261-.792-.653-.938z"/><path fill="#FFCC4D" d="M14.347 27.894l-2.314-.856-.9-3.3c-.118-.436-.513-.738-.964-.738-.451 0-.846.302-.965.737l-.9 3.3-2.313.856c-.393.145-.653.52-.653.938 0 .418.26.793.653.938l2.301.853.907 3.622c.112.444.511.756.97.756.459 0 .858-.312.97-.757l.907-3.622 2.301-.853c.393-.144.653-.519.653-.937 0-.418-.26-.793-.653-.937zM10.009 6.231l-2.364-.875-.876-2.365c-.145-.393-.519-.653-.938-.653-.418 0-.792.26-.938.653l-.875 2.365-2.365.875c-.393.146-.653.52-.653.938 0 .418.26.793.653.938l2.365.875.875 2.365c.146.393.52.653.938.653.418 0 .792-.26.938-.653l.875-2.365 2.365-.875c.393-.146.653-.52.653-.938 0-.418-.26-.792-.653-.938z"/></svg> ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.css ===================================== @@ -44,14 +44,14 @@ p { #header { display: grid; - grid-template-rows: auto auto; - grid-template-columns: auto; + grid-template: "heading" auto "text" auto / auto; justify-items: center; align-content: center; gap: 1.5em; } #headingContainer { + grid-area: heading; display: inline flex; flex-direction: row; white-space: nowrap; @@ -59,6 +59,32 @@ p { gap: 16px; } +#mullvad-browser-update, +#mullvad-browser-intro { + grid-area: text; +} + +body:not(.has-update) #mullvad-browser-update { + display: none; +} + +body:not(.no-update) #mullvad-browser-intro { + /* Invisible but still reserves space for when the page is initially loaded to + * prevent the Mullvad title from jumping. */ + visibility: hidden; +} + +#mullvad-browser-update-img { + height: 1em; + vertical-align: sub; + margin-inline-end: 0.3em; +} + +#mullvad-browser-update a { + /* Increase gap between the link and the rest of the text. */ + margin-inline: 0.4em; +} + #footer { padding-block: 40px; background: rgba(0, 0, 0, 0.2); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.js ===================================== @@ -0,0 +1,20 @@ +"use strict"; + +window.addEventListener("UpdateData", event => { + const detail = event.detail; + if (detail) { + const { url, version } = detail; + + const text = document.getElementById("mullvad-browser-update"); + document.l10n.setAttributes( + text.querySelector("span"), + "about-mullvad-browser-update-message", + { version } + ); + text.querySelector("a").href = url; + } + // Before the first call, neither the intro nor update text are shown, this + // prevents the intro text from flashing in and out when we have an update. + document.body.classList.toggle("no-update", !detail); + document.body.classList.toggle("has-update", !!detail); +}); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml ===================================== @@ -21,6 +21,8 @@ rel="localization" href="browser/mullvad-browser/aboutMullvadBrowser.ftl" /> + + <script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script> </head> <body> <div id="header"> @@ -48,11 +50,22 @@ data-l10n-id="about-mullvad-browser-heading" ></h1> </div> - <p data-l10n-id="about-mullvad-browser-developed-by"> + <p + id="mullvad-browser-intro" + data-l10n-id="about-mullvad-browser-developed-by" + > <a data-l10n-name="tor-project-link" href="https://www.torproject.org"> </a> <a data-l10n-name="mullvad-vpn-link" href="https://mullvad.net"> </a> </p> + <p id="mullvad-browser-update"> + <img + id="mullvad-browser-update-img" + alt="" + src="chrome://browser/content/mullvad-browser/2728-sparkles.svg" + /> + <span><a data-l10n-name="update-link"></a></span> + </p> </div> <div id="footer"> <p data-l10n-id="about-mullvad-browser-use-vpn"> ===================================== browser/components/mullvad-browser/jar.mn ===================================== @@ -1,4 +1,6 @@ browser.jar: + content/browser/mullvad-browser/aboutMullvadBrowser.js (content/aboutMullvadBrowser.js) content/browser/mullvad-browser/aboutMullvadBrowser.xhtml (content/aboutMullvadBrowser.xhtml) content/browser/mullvad-browser/aboutMullvadBrowser.css (content/aboutMullvadBrowser.css) content/browser/mullvad-browser/mullvadBrowserFont.css (content/mullvadBrowserFont.css) + content/browser/mullvad-browser/2728-sparkles.svg (content/2728-sparkles.svg) ===================================== browser/components/mullvad-browser/moz.build ===================================== @@ -1 +1,6 @@ JAR_MANIFESTS += ["jar.mn"] + +FINAL_TARGET_FILES.actors += [ + "AboutMullvadBrowserChild.sys.mjs", + "AboutMullvadBrowserParent.sys.mjs", +] ===================================== browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl ===================================== @@ -3,6 +3,11 @@ about-mullvad-browser-developed-by = Developed in collaboration between the <a d about-mullvad-browser-use-vpn = Get more privacy by using the browser <a data-l10n-name="with-vpn-link">with Mullvad VPN</a>. about-mullvad-browser-learn-more = Curious to learn more about the browser? <a data-l10n-name="learn-more-link">Take a dive into the mole hole</a>. +# Update message. +# <a data-l10n-name="update-link"> should contain the link text and close with </a>. +# $version (String) - The new browser version. +about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a> + ## Deprecated. To be removed when 13.5 becomes stable. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d4310b2a by Pier Angelo Vendrame at 2024-03-06T19:22:00+01:00 fixup! Firefox preference overrides. MB 80: Allow default browser on Windows for Mullvad Browser - - - - - 12e3f725 by Pier Angelo Vendrame at 2024-03-06T19:22:09+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Force `GenerateAppUserModelID` to use the profile directory in portable mode. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - widget/windows/WinTaskbar.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -631,11 +631,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); pref("dom.text-recognition.enabled", false); #ifdef XP_WIN -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) -// this pref changes the app's set AUMID to be dependent on the profile path, rather than -// attempting to read it from the registry; this is necessary so that the file generated -// by the jumplist system can be properly deleted if it is disabled -pref("taskbar.grouping.useprofile", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.tasks.enabled", false); ===================================== widget/windows/WinTaskbar.cpp ===================================== @@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, // If marked as such in prefs, use a hash of the profile path for the id // instead of the install path hash setup by the installer. bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false); + + { + // For portable mode, force the AUMID to be based on the profile directory + // instead of reading it from the registry. + bool isPortable = true; + // Do not even check if taskbar.grouping.useprofile is already true. + if (!useProfile && + NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) && + isPortable) { + useProfile = true; + } + } + if (useProfile) { nsCOMPtr<nsIFile> profileDir; NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4471d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4471d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: dc518fc9 by Pier Angelo Vendrame at 2024-03-06T19:21:22+01:00 fixup! Firefox preference overrides. MB 80: Allow default browser on Windows for Mullvad Browser - - - - - afac3196 by Pier Angelo Vendrame at 2024-03-06T19:21:32+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Force `GenerateAppUserModelID` to use the profile directory in portable mode. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - widget/windows/WinTaskbar.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -631,11 +631,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); pref("dom.text-recognition.enabled", false); #ifdef XP_WIN -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) -// this pref changes the app's set AUMID to be dependent on the profile path, rather than -// attempting to read it from the registry; this is necessary so that the file generated -// by the jumplist system can be properly deleted if it is disabled -pref("taskbar.grouping.useprofile", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.tasks.enabled", false); ===================================== widget/windows/WinTaskbar.cpp ===================================== @@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, // If marked as such in prefs, use a hash of the profile path for the id // instead of the install path hash setup by the installer. bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false); + + { + // For portable mode, force the AUMID to be based on the profile directory + // instead of reading it from the registry. + bool isPortable = true; + // Do not even check if taskbar.grouping.useprofile is already true. + if (!useProfile && + NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) && + isPortable) { + useProfile = true; + } + } + if (useProfile) { nsCOMPtr<nsIFile> profileDir; NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3ff42… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3ff42… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 6 commits: Revert "MB 87: Disable the default browser box on Windows and Linux"
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 8893383e by Pier Angelo Vendrame at 2024-03-06T19:18:51+01:00 Revert "MB 87: Disable the default browser box on Windows and Linux" This reverts commit bd64d5f09ec5cd2bab9db6fdc0ff679107b7fc4a. We are going to disable the default browser whenever we are in portable mode instead. - - - - - 757aaf94 by Pier Angelo Vendrame at 2024-03-06T19:18:53+01:00 fixup! Firefox preference overrides. MB 80: Allow default browser on Windows for Mullvad Browser - - - - - 51bf1800 by Pier Angelo Vendrame at 2024-03-06T19:18:54+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Force `GenerateAppUserModelID` to use the profile directory in portable mode. - - - - - 722401c5 by Pier Angelo Vendrame at 2024-03-06T19:18:55+01:00 fixup! MB 38: Mullvad Browser configuration MB 80: Enable the default browser agent - - - - - 5eeb2ea8 by Pier Angelo Vendrame at 2024-03-06T19:18:55+01:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 68744b70 by Pier Angelo Vendrame at 2024-03-06T19:18:56+01:00 fixup! MB 80: Enable Mullvad Browser as a default browser Debugging faciliites. - - - - - 14 changed files: - browser/app/profile/001-base-profile.js - browser/components/preferences/main.js - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/installer/package-manifest.in - mozconfig-windows-x86_64 - + other-licenses/nsis/Contrib/ApplicationID/Makefile - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/defaultagent/moz.build - widget/windows/WinTaskbar.cpp - widget/windows/moz.build Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -629,11 +629,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); pref("dom.text-recognition.enabled", false); #ifdef XP_WIN -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) -// this pref changes the app's set AUMID to be dependent on the profile path, rather than -// attempting to read it from the registry; this is necessary so that the file generated -// by the jumplist system can be properly deleted if it is disabled -pref("taskbar.grouping.useprofile", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.tasks.enabled", false); ===================================== browser/components/preferences/main.js ===================================== @@ -1743,10 +1743,11 @@ var gMainPane = { let shellSvc = getShellService(); let defaultBrowserBox = document.getElementById("defaultBrowserBox"); let isInFlatpak = gGIOService?.isRunningUnderFlatpak; + const xreDirProvider = Cc[ + "@mozilla.org/xre/directory-provider;1" + ].getService(Ci.nsIXREDirProvider); // Flatpak does not support setting nor detection of default browser - // privacy-browser#87: Let's keep the default browser box only on macOS - // for now. - if (!shellSvc || isInFlatpak || Services.appinfo.OS !== "Darwin") { + if (!shellSvc || isInFlatpak || xreDirProvider.isPortableMode) { defaultBrowserBox.hidden = true; return; } ===================================== browser/components/shell/ShellService.sys.mjs ===================================== @@ -64,7 +64,8 @@ let ShellServiceInternal = { }, isDefaultBrowserOptOut() { - if (AppConstants.platform == "win") { + // Mozilla is also going to disable this, see Bug 1274517 and Bug 1272162. + if (AppConstants.platform == "win" && !AppConstants.BASE_BROWSER_VERSION) { let optOutValue = lazy.WindowsRegistry.readRegKey( Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, "Software\\Mozilla\\Firefox", @@ -295,7 +296,7 @@ let ShellServiceInternal = { ) { if (this._shouldSetDefaultPDFHandler()) { lazy.log.info("Setting Firefox as default PDF handler"); - exeArgs.push(".pdf", "FirefoxPDF"); + exeArgs.push(".pdf", "MullvadBrowserPDF"); } else { lazy.log.info("Not setting Firefox as default PDF handler"); } @@ -338,7 +339,7 @@ let ShellServiceInternal = { "set-default-extension-handlers-user-choice", aumi, ".pdf", - "FirefoxPDF", + "MullvadBrowserPDF", ], }); telemetryResult = "ErrOther"; ===================================== browser/components/shell/WindowsDefaultBrowser.cpp ===================================== @@ -31,7 +31,7 @@ #include <wchar.h> #include <windows.h> -#define APP_REG_NAME_BASE L"Firefox-" +#define APP_REG_NAME_BASE L"MullvadBrowser-" static bool IsWindowsLogonConnected() { WCHAR userName[UNLEN + 1]; ===================================== browser/components/shell/nsWindowsShellService.cpp ===================================== @@ -310,9 +310,11 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) { return NS_OK; } *aResult = - CheckProgIDExists(FormatProgID(L"FirefoxURL", aumid.get()).get()) && - CheckProgIDExists(FormatProgID(L"FirefoxHTML", aumid.get()).get()) && - CheckProgIDExists(FormatProgID(L"FirefoxPDF", aumid.get()).get()); + CheckProgIDExists( + FormatProgID(L"MullvadBrowserURL", aumid.get()).get()) && + CheckProgIDExists( + FormatProgID(L"MullvadBrowserHTML", aumid.get()).get()) && + CheckProgIDExists(FormatProgID(L"MullvadBrowserPDF", aumid.get()).get()); return NS_OK; } ===================================== browser/installer/package-manifest.in ===================================== @@ -63,8 +63,8 @@ @RESPATH@/updater.ini #endif #ifdef MOZ_DEFAULT_BROWSER_AGENT -@RESPATH@/defaultagent.ini -@RESPATH@/defaultagent_localized.ini +; @RESPATH@/defaultagent.ini +; @RESPATH@/defaultagent_localized.ini #endif #if defined(MOZ_UPDATE_AGENT) || defined(MOZ_DEFAULT_BROWSER_AGENT) @RESPATH@/locale.ini ===================================== mozconfig-windows-x86_64 ===================================== @@ -8,7 +8,6 @@ ac_add_options --enable-strip # Bits is Background Intelligent Transfer Service ac_add_options --disable-bits-download ac_add_options --disable-maintenance-service -ac_add_options --disable-default-browser-agent # See bug #13379 ac_add_options --enable-nss-mar ===================================== other-licenses/nsis/Contrib/ApplicationID/Makefile ===================================== @@ -0,0 +1,14 @@ +CXXFLAGS=-Icityhash -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DCITYHASH_EXPORTS -DUNICODE +SRCS=Set.cpp +OBJS=$(subst .cpp,.o,$(SRCS)) +LDFLAGS=-lole32 -lshlwapi -shared -Wl,--no-insert-timestamp +PLUGIN=ApplicationID.dll + +all: $(PLUGIN) + +$(PLUGIN): $(OBJS) + $(CXX) $(OBJS) $(LDFLAGS) -o $@ + llvm-strip $@ + +clean: + $(RM) $(OBJS) $(PLUGIN) ===================================== other-licenses/nsis/Contrib/CityHash/Makefile ===================================== @@ -0,0 +1,14 @@ +CXXFLAGS=-Icityhash -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DCITYHASH_EXPORTS -DUNICODE +SRCS=CityHash.cpp cityhash/city.cpp +OBJS=$(subst .cpp,.o,$(SRCS)) +LDFLAGS=-shared -Wl,--no-insert-timestamp +PLUGIN=CityHash.dll + +all: $(PLUGIN) + +$(PLUGIN): $(OBJS) + $(CXX) $(OBJS) $(LDFLAGS) -o $@ + llvm-strip $@ + +clean: + $(RM) $(OBJS) $(PLUGIN) ===================================== toolkit/mozapps/defaultagent/EventLog.h ===================================== @@ -7,7 +7,7 @@ #ifndef __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ #define __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ -#include "mozilla/Types.h" +#include <cwchar> MOZ_BEGIN_EXTERN_C @@ -15,10 +15,21 @@ extern MOZ_EXPORT const wchar_t* gWinEventLogSourceName; MOZ_END_EXTERN_C -#include "mozilla/WindowsEventLog.h" - -#define LOG_ERROR(hr) MOZ_WIN_EVENT_LOG_ERROR(gWinEventLogSourceName, hr) -#define LOG_ERROR_MESSAGE(format, ...) \ - MOZ_WIN_EVENT_LOG_ERROR_MESSAGE(gWinEventLogSourceName, format, __VA_ARGS__) +#ifdef LOG_ERRORS_FILE +extern FILE* gLogFile; +# define LOG_ERROR(hr) \ + if (gLogFile) { \ + fprintf(gLogFile, "Error in %s:%d: 0x%X\r\n", __FILE__, __LINE__, \ + (unsigned int)hr); \ + } +# define LOG_ERROR_MESSAGE(format, ...) \ + if (gLogFile) { \ + fwprintf(gLogFile, format __VA_OPT__(, ) __VA_ARGS__); \ + fputs("\r\n", gLogFile); \ + } +#else +# define LOG_ERROR(hr) +# define LOG_ERROR_MESSAGE(format, ...) +#endif #endif // __DEFAULT_BROWSER_AGENT_EVENT_LOG_H__ ===================================== toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp ===================================== @@ -224,19 +224,19 @@ static bool VerifyUserDefault(const wchar_t* aExt, const wchar_t* aProgID) { HRESULT SetDefaultBrowserUserChoice( const wchar_t* aAumi, const wchar_t* const* aExtraFileExtensions) { - auto urlProgID = FormatProgID(L"FirefoxURL", aAumi); + auto urlProgID = FormatProgID(L"MullvadBrowserURL", aAumi); if (!CheckProgIDExists(urlProgID.get())) { LOG_ERROR_MESSAGE(L"ProgID %s not found", urlProgID.get()); return MOZ_E_NO_PROGID; } - auto htmlProgID = FormatProgID(L"FirefoxHTML", aAumi); + auto htmlProgID = FormatProgID(L"MullvadBrowserHTML", aAumi); if (!CheckProgIDExists(htmlProgID.get())) { LOG_ERROR_MESSAGE(L"ProgID %s not found", htmlProgID.get()); return MOZ_E_NO_PROGID; } - auto pdfProgID = FormatProgID(L"FirefoxPDF", aAumi); + auto pdfProgID = FormatProgID(L"MullvadBrowserPDF", aAumi); if (!CheckProgIDExists(pdfProgID.get())) { LOG_ERROR_MESSAGE(L"ProgID %s not found", pdfProgID.get()); return MOZ_E_NO_PROGID; @@ -363,3 +363,41 @@ HRESULT SetDefaultExtensionHandlersUserChoiceImpl( return S_OK; } + +#ifdef LOG_ERRORS_FILE +FILE* gLogFile; +#endif + +// Simplified version of wmain that uses only this file from main.cpp. +int wmain(int argc, wchar_t** argv) { + if (argc < 3 || !argv[1] || !argv[2]) { + return E_INVALIDARG; + } + +#ifdef LOG_ERRORS_FILE + std::unique_ptr<FILE, decltype(&fclose)> logFile(fopen(LOG_ERRORS_FILE, "a+"), + &fclose); + gLogFile = logFile.get(); +#endif + + HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); + if (FAILED(hr)) { + LOG_ERROR(hr); + return hr; + } + const struct ComUninitializer { + ~ComUninitializer() { CoUninitialize(); } + } kCUi; + + if (!wcscmp(argv[1], L"set-default-browser-user-choice")) { + // `argv` is itself null-terminated, so we can safely pass the tail of the + // array here. + return SetDefaultBrowserUserChoice(argv[2], &argv[3]); + } else if (!wcscmp(argv[1], L"set-default-extension-handlers-user-choice")) { + // `argv` is itself null-terminated, so we can safely pass the tail of the + // array here. + return SetDefaultExtensionHandlersUserChoice(argv[2], &argv[3]); + } else { + return E_INVALIDARG; + } +} ===================================== toolkit/mozapps/defaultagent/moz.build ===================================== @@ -6,51 +6,23 @@ Program("default-browser-agent") -SPHINX_TREES["default-browser-agent"] = "docs" - -DIRS += ["rust"] - UNIFIED_SOURCES += [ "/mfbt/Poison.cpp", "/mfbt/Unused.cpp", - "Cache.cpp", - "common.cpp", - "DefaultBrowser.cpp", - "DefaultPDF.cpp", - "EventLog.cpp", - "main.cpp", - "Notification.cpp", - "Policy.cpp", - "Registry.cpp", - "RemoteSettings.cpp", - "ScheduledTask.cpp", "SetDefaultBrowser.cpp", - "Telemetry.cpp", - "UtfConvert.cpp", ] SOURCES += [ "/browser/components/shell/WindowsDefaultBrowser.cpp", "/browser/components/shell/WindowsUserChoice.cpp", "/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp", - "/third_party/WinToast/wintoastlib.cpp", "/toolkit/mozapps/update/common/readstrings.cpp", ] -# Suppress warnings from third-party code. -SOURCES["/third_party/WinToast/wintoastlib.cpp"].flags += ["-Wno-implicit-fallthrough"] - -USE_LIBS += [ - "defaultagent-static", - "jsoncpp", -] - LOCAL_INCLUDES += [ "/browser/components/shell/", "/mfbt/", "/other-licenses/nsis/Contrib/CityHash/cityhash", - "/third_party/WinToast", - "/toolkit/components/jsoncpp/include", "/toolkit/mozapps/update/common", "/xpcom/build", ] @@ -58,20 +30,12 @@ LOCAL_INCLUDES += [ OS_LIBS += [ "advapi32", "bcrypt", - "comsupp", "crypt32", - "kernel32", "netapi32", "ole32", - "oleaut32", - "rpcrt4", "shell32", "shlwapi", - "taskschd", - "userenv", - "wininet", - "ws2_32", - "ntdll", + "uuid", ] DEFINES["NS_NO_XPCOM"] = True @@ -96,18 +60,3 @@ if CONFIG["CC_TYPE"] == "clang-cl": WIN32_EXE_LDFLAGS += ["-ENTRY:wmainCRTStartup"] else: WIN32_EXE_LDFLAGS += ["-municode"] - -GENERATED_FILES += ["defaultagent.ini"] -defaultagentini = GENERATED_FILES["defaultagent.ini"] -defaultagentini.script = "/browser/locales/generate_ini.py" -defaultagentini.inputs = [ - "defaultagent.ini", - "defaultagent_append.ini", -] -FINAL_TARGET_FILES += ["!defaultagent.ini"] - -if CONFIG["ENABLE_TESTS"]: - DIRS += ["tests/gtest"] - -with Files("**"): - BUG_COMPONENT = ("Toolkit", "Default Browser Agent") ===================================== widget/windows/WinTaskbar.cpp ===================================== @@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, // If marked as such in prefs, use a hash of the profile path for the id // instead of the install path hash setup by the installer. bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false); + + { + // For portable mode, force the AUMID to be based on the profile directory + // instead of reading it from the registry. + bool isPortable = true; + // Do not even check if taskbar.grouping.useprofile is already true. + if (!useProfile && + NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) && + isPortable) { + useProfile = true; + } + } + if (useProfile) { nsCOMPtr<nsIFile> profileDir; NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, @@ -237,7 +250,7 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, nsCString appName; if (appInfo && NS_SUCCEEDED(appInfo->GetName(appName))) { nsAutoString regKey; - regKey.AssignLiteral("Software\\Mozilla\\"); + regKey.AssignLiteral("Software\\" MOZ_APP_VENDOR "\\"); AppendASCIItoUTF16(appName, regKey); regKey.AppendLiteral("\\TaskBarIDs"); ===================================== widget/windows/moz.build ===================================== @@ -188,6 +188,7 @@ DEFINES["MOZ_UNICODE"] = True DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"] # Turn `firefox` into `Firefox`. DEFINES["MOZ_TOAST_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"].title() +DEFINES["MOZ_APP_VENDOR"] = '"%s"' % CONFIG["MOZ_APP_VENDOR"] for var in ("MOZ_ENABLE_D3D10_LAYER",): if CONFIG[var]: View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41089: Register file types in the Mullvad Browser installer.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e764744f by Pier Angelo Vendrame at 2024-03-04T11:24:56+01:00 Bug 41089: Register file types in the Mullvad Browser installer. This step is needed to set Mullvad Browser as a default browser. Also, we use the same way as Firefox to identify different installs uniquely based on the hash of their installation directory. Therefore, we need to build the CityHash NSIS plugin on Firefox and consume it in browser. We do the same for the ApplicationID plugin. - - - - - 7 changed files: - projects/browser/build - projects/browser/config - projects/browser/windows-installer/browser-install.nsi - projects/browser/windows-installer/defines.nsh.in - projects/browser/windows-installer/postupdate.nsi - projects/browser/windows-installer/registry.nsh - projects/firefox/build Changes: ===================================== projects/browser/build ===================================== @@ -320,6 +320,7 @@ done [% IF c('var/mullvad-browser') -%] pushd $distdir/windows-installer + tar -xf $rootdir/[% c('input_files_by_name/firefox') %]/nsis-plugins.tar.[% c("compress_tar") %] # While Firefox re-uses the uninstaller for this, we cannot do it, because # we write the uninstaller from the installer. # Instead, we need to write an updated postupdate.exe also when updating. ===================================== projects/browser/config ===================================== @@ -124,6 +124,7 @@ input_files: - filename: 'defines.nsh' content: '[% INCLUDE "windows-installer/defines.nsh.in" %]' refresh_input: 1 + enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' # To generate a new keystore, see how-to-generate-keystore.txt ===================================== projects/browser/windows-installer/browser-install.nsi ===================================== @@ -1,5 +1,7 @@ + !addplugindir nsis-plugins !include "common.nsh" !include "registry.nsh" + !include "Win\COM.nsh" ;-------------------------------- OutFile "browser-install.exe" @@ -219,7 +221,7 @@ Section "Browser" SecBrowser ; Write the uninstaller WriteUninstaller $INSTDIR\uninstall.exe - !insertmacro UPDATE_REGISTRY + Call UpdateRegistry CreateShortCut "$SMPROGRAMS\${DISPLAY_NAME}.lnk" "$INSTDIR\${EXE_NAME}" ${If} $createDesktopShortcut == "true" @@ -238,24 +240,57 @@ FunctionEnd ;-------------------------------- ; Uninstaller + +Function un.GetPathFromString + !insertmacro GetPathFromStringImp +FunctionEnd + Section "Uninstall" + ; Currently, the uninstaller is written by the installer, only in install + ; mode, and we do not have any way to update it. + ; However, we keep postupdate.exe updated, so we can use that instead. + ExecWait '"$INSTDIR\postupdate.exe" /Uninstall' $0 + RMDir /r "$INSTDIR" DeleteRegKey HKCU "${UNINST_KEY}" - StrCpy $0 "" - ShellLink::GetShortCutTarget "$SMPROGRAMS\${DISPLAY_NAME}.lnk" - Pop $0 - ${If} $0 == "$INSTDIR\${EXE_NAME}" - Delete "$SMPROGRAMS\${DISPLAY_NAME}.lnk" - ${EndIf} + StrCpy $2 "$SMPROGRAMS\${DISPLAY_NAME}.lnk" + StrCpy $3 "" + ShellLink::GetShortCutTarget "$2" + Pop $3 + ${If} $3 == "$INSTDIR\${EXE_NAME}" + ; https://stackoverflow.com/questions/42816091/nsis-remove-pinned-icon-from-t… + !insertmacro ComHlpr_CreateInProcInstance ${CLSID_StartMenuPin} ${IID_IStartMenuPinnedList} r0 "" + ${If} $0 P<> 0 + System::Call 'SHELL32::SHCreateItemFromParsingName(ws, p0, g "${IID_IShellItem}", *p0r1)' "$2" + ${If} $1 P<> 0 + ${IStartMenuPinnedList::RemoveFromList} $0 '(r1)' + ${IUnknown::Release} $1 "" + ${EndIf} + ${IUnknown::Release} $0 "" + ${EndIf} - StrCpy $0 "" - ShellLink::GetShortCutTarget "$DESKTOP\${DISPLAY_NAME}.lnk" - Pop $0 - ${If} $0 == "$INSTDIR\${EXE_NAME}" - Delete "$DESKTOP\${DISPLAY_NAME}.lnk" + Delete "$2" ${EndIf} + FindFirst $1 $2 "$DESKTOP\*.lnk" + loop: + IfErrors end + StrCpy $0 "" + ShellLink::GetShortCutTarget "$DESKTOP\$2" + ; Do not pop, and pass the value over + Call un.GetPathFromString + Pop $0 + ${If} $0 == "$INSTDIR\${EXE_NAME}" + Delete "$DESKTOP\$2" + ${EndIf} + FindNext $1 $2 + goto loop + end: + FindClose $1 + + ${RefreshShellIcons} + ; TODO: Optionally remove profiles. ; This operation is not trivial, because it involes finding our installation ; hash, its associated default profile and making sure it is not shared with ===================================== projects/browser/windows-installer/defines.nsh.in ===================================== @@ -5,13 +5,7 @@ ; Project and display name !define PROJECT_NAME "[% c('var/Project_Name') %]" -[% IF c("var/channel") == "release" -%] - !define DISPLAY_NAME "[% c('var/Project_Name') %]" -[% ELSIF c("var/testbuild") -%] - !define DISPLAY_NAME "[% c('var/Project_Name') %] Testbuild" -[% ELSE -%] - !define DISPLAY_NAME "[% c('var/Project_Name_Channel') %]" -[% END -%] + !define DISPLAY_NAME "[% c('var/display_name') %]" !define NAME_NO_SPACES "[% c('var/ProjectName') %]" !define UPDATE_CHANNEL "[% c('var/channel') FILTER ucfirst %]" ===================================== projects/browser/windows-installer/postupdate.nsi ===================================== @@ -1,3 +1,4 @@ +!addplugindir nsis-plugins !include "FileFunc.nsh" !include "LogicLib.nsh" @@ -9,9 +10,14 @@ Icon "${ICON_NAME}" RequestExecutionLevel user Function .onInit + StrCpy $INSTDIR $EXEDIR + ${GetOptions} $CMDLINE "/Visible" $0 IfErrors 0 +2 SetSilent silent + ${GetOptions} $CMDLINE "/Uninstall" $0 + IfErrors +2 0 + Call Uninstall FunctionEnd Section PostUpdate "PostUpdate" @@ -19,10 +25,14 @@ Section PostUpdate "PostUpdate" IfFileExists $EXEDIR\system-install 0 +2 StrCpy $0 "true" ${If} $0 == "true" - StrCpy $INSTDIR $EXEDIR - !insertmacro UPDATE_REGISTRY + Call UpdateRegistry RMDir /r /REBOOTOK $EXEDIR\tobedeleted ${Else} RMDir /r $EXEDIR\tobedeleted ${EndIf} SectionEnd + +Function Uninstall + Call ClearRegistry + Quit +FunctionEnd ===================================== projects/browser/windows-installer/registry.nsh ===================================== @@ -1,6 +1,39 @@ +; Utilities to update the registry values in installs. +; Based on Firefox's NSIS scripts. +; +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at http://mozilla.org/MPL/2.0/. + !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME_NO_SPACES}${UPDATE_CHANNEL}" -!macro UPDATE_REGISTRY +; The only "public" functions of this file are UpdateRegistry and ClearRegistry. + +var aumid + +; Compute the AUMID we will use for our links. +; We use the same strategy as Firefox: we hash the path of the installation +; directory with CityHash64. +; See InitHashAppModelId in toolkit/mozapps/installer/windows/nsis/common.nsh. +; While we could differentiate between channels (we force one install for each +; channel), following Firefox has the advantage that we have to adapt/rework +; less stuff. +Function ComputeAumid + StrCpy $0 $INSTDIR + ; NSIS command will not convert from short form to the long one. + ; So, this is the way they suggest to get the long name in their docs. + System::Call 'kernel32::GetLongPathName(t r0, t .r1, i ${NSIS_MAX_STRLEN}) i .r2' + ${If} $2 != "error" + CityHash::GetCityHash64 $1 + Pop $aumid + ${Else} + StrCpy $aumid "error" + ${EndIf} +FunctionEnd + +; Set the installation details. +; See https://nsis.sourceforge.io/Add_uninstall_information_to_Add/Remove_Programs. +Function SetUninstallData WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "${DISPLAY_NAME}" WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$\"$INSTDIR\${EXE_NAME}$\"" WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "${VERSION}" @@ -16,4 +49,332 @@ WriteRegStr HKCU "${UNINST_KEY}" "URLInfoAbout" "${URL_ABOUT}" WriteRegStr HKCU "${UNINST_KEY}" "URLUpdateInfo" "${URL_UPDATE}" WriteRegStr HKCU "${UNINST_KEY}" "HelpLink" "${URL_HELP}" +FunctionEnd + +; Register a certain class in the form $browserName$className-$aumid. +; The classes registered by Firefox are URL, HTML and PDF. +; The default browser agent checks them before registering anything. +; See SetDefaultBrowserUserChoice in +; toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp, FormatProgID and +; CheckProgIDExists in browser/components/shell/WindowsUserChoice.cpp. +; See also AddHandlerValues in +; toolkit/mozapps/installer/windows/nsis/common.nsh. +Function RegisterClass + ; Based on Firefox's AddHandlerValues + Pop $3 ; Is this a protocol? + Pop $2 ; Icon index + Pop $1 ; Description + Pop $0 ; Class name + + StrCpy $R0 "${NAME_NO_SPACES}$0-$aumid" ; Expanded class name + StrCpy $R1 "${PROJECT_NAME} $1" ; Description with project name + StrCpy $R2 "$INSTDIR\${EXE_NAME}" ; Full path to the main executable + StrCpy $R3 "Software\Classes\$R0" ; Registry key to update + + WriteRegStr HKCU $R3 "" "$R1" + WriteRegStr HKCU $R3 "FriendlyTypeName" "$R1" + ${If} $3 == "true" + WriteRegStr HKCU $R3 "URL Protocol" "" + ${EndIf} + ; Firefox sets EditFlags only when empty + ReadRegDWORD $R4 HKCU $R3 "EditFlags" + ${If} $R4 == "" + WriteRegDWORD HKCU $R3 "EditFlags" 0x00000002 + ${EndIf} + WriteRegStr HKCU "$R3\DefaultIcon" "" "$R2,$2" + WriteRegStr HKCU "$R3\shell" "" "open" + WriteRegStr HKCU "$R3\shell\open\command" "" '"$R2" -osint -url "%1"' +FunctionEnd + +; Register all the classes we need to handle. +; See RegisterClass. +Function RegisterClasses + Push "URL" + Push "URL" + Push 1 + Push true + Call RegisterClass + + Push "HTML" + Push "HTML Document" + Push 1 + Push false + Call RegisterClass + + Push "PDF" + Push "PDF Document" + Push 5 + Push false + Call RegisterClass +FunctionEnd + +; Register the start menu entry. +; Microsoft's documentation says this is deprecated after Windows 8, however +; these entries are still visible in the settings application. +; See the SetStartMenuInternet macro in +; browser/installer/windows/nsis/shared.nsh. +; We do not add entries for features we do not support, such as the safe mode. +; Also, the functionality to hide/show shortcuts should not apply to Windows 10, +; so we did not implement that as well. +Function RegisterStartMenu + StrCpy $0 "Software\Clients\StartMenuInternet\${NAME_NO_SPACES}-$aumid" + StrCpy $1 "$INSTDIR\${EXE_NAME}" + StrCpy $2 "${NAME_NO_SPACES}-$aumid" + StrCpy $3 "${NAME_NO_SPACES}URL-$aumid" + StrCpy $4 "${NAME_NO_SPACES}HTML-$aumid" + StrCpy $5 "${NAME_NO_SPACES}PDF-$aumid" + + WriteRegStr HKCU "$0" "" "${DISPLAY_NAME}" + WriteRegStr HKCU "$0\DefaultItcon" "" "$1,0" + WriteRegStr HKCU "$0\shell\open\command" "" '"$1"' + WriteRegStr HKCU "$0\Capabilities\StartMenu" "StartMenuInternet" "$2" + ; Same as Firefox, see SetStartMenuInternet + ; URLs + WriteRegStr HKCU "$0\Capabilities\URLAssociations" "http" "$3" + WriteRegStr HKCU "$0\Capabilities\URLAssociations" "https" "$3" + ; mailto is currently unsupported, but we could enable it here, if needed. + ; WriteRegStr HKCU "$0\Capabilities\URLAssociations" "mailto" "$3" + ; No need to uninstall FTP here, since we had never installed it. + ; HTML + aumid + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".htm" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".html" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".shtml" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".xht" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".xhtml" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".svg" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".webp" "$4" + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".avif" "$4" + ; PDF + aumid + WriteRegStr HKCU "$0\Capabilities\FileAssociations" ".pdf" "$5" + + WriteRegStr HKCU "Software\RegisteredApplications" "$2" "$0\Capabilities" +FunctionEnd + +; Copied from toolkit/mozapps/installer/windows/nsis/common.nsh. +; Implemented as a macro first so that we can use it both in the installer (to +; update the registry) and in the uninstaller (to check which links we have to +; remove). The macro is then expanded in an installer function, and in an +; uninstaller function, to avoid multiple copies of the same code. +!macro GetPathFromStringImp + Exch $R9 + Push $R8 + Push $R7 + + StrCpy $R7 0 ; Set the counter to 0. + + ; Handle quoted paths with arguments. + StrCpy $R8 $R9 1 ; Copy the first char. + StrCmp $R8 '"' +2 +1 ; Is it a "? + StrCmp $R8 "'" +1 +9 ; Is it a '? + StrCpy $R9 $R9 "" 1 ; Remove the first char. + IntOp $R7 $R7 + 1 ; Increment the counter. + StrCpy $R8 $R9 1 $R7 ; Starting from the counter copy the next char. + StrCmp $R8 "" end +1 ; Are there no more chars? + StrCmp $R8 '"' +2 +1 ; Is it a " char? + StrCmp $R8 "'" +1 -4 ; Is it a ' char? + StrCpy $R9 $R9 $R7 ; Copy chars up to the counter. + GoTo end + + ; Handle DefaultIcon paths. DefaultIcon paths are not quoted and end with + ; a , and a number. + IntOp $R7 $R7 - 1 ; Decrement the counter. + StrCpy $R8 $R9 1 $R7 ; Copy one char from the end minus the counter. + StrCmp $R8 '' +4 +1 ; Are there no more chars? + StrCmp $R8 ',' +1 -3 ; Is it a , char? + StrCpy $R9 $R9 $R7 ; Copy chars up to the end minus the counter. + GoTo end + + ; Handle unquoted paths with arguments. An unquoted path with arguments + ; must be an 8dot3 path. + StrCpy $R7 -1 ; Set the counter to -1 so it will start at 0. + IntOp $R7 $R7 + 1 ; Increment the counter. + StrCpy $R8 $R9 1 $R7 ; Starting from the counter copy the next char. + StrCmp $R8 "" end +1 ; Are there no more chars? + StrCmp $R8 " " +1 -3 ; Is it a space char? + StrCpy $R9 $R9 $R7 ; Copy chars up to the counter. + + end: + ClearErrors + + Pop $R7 + Pop $R8 + Exch $R9 !macroend + +Function GetPathFromString + !insertmacro GetPathFromStringImp +FunctionEnd + +; Create a Software\Classes\Applications\$exeName.exe entry, shared by all the +; installs. +; If this key has already been registered by another channel/install, we just +; make sure the open entry has the expected command line flags. +; See SetStartMenuInternet in browser/installer/windows/nsis/shared.nsh. +Function RegisterTypes + StrCpy $0 "Software\Classes\Applications\${EXE_NAME}" + StrCpy $1 "$0\shell\open\command" + StrCpy $2 "$0\SupportedTypes" + + ReadRegStr $3 HKCU "$1" "" + ${If} $3 != "" + ; If the user already has something, we just update it to make sure it + ; contains the -osint flag. This should not be a problem if we created these + ; entries, but we still check them in case they were added manually. + Push $3 + Call GetPathFromString + Pop $3 + WriteRegStr HKCU "$1" "" '"$3" -osint -url "%1"' + ${Else} + WriteRegStr HKCU "$1" "" '"$INSTDIR\${EXE_NAME}" -osint -url "%1"' + WriteRegStr HKCU "$0\DefaultIcon" "" "$INSTDIR\${EXE_NAME},1" + + ; Same as Firefox, see SetStartMenuInternet + WriteRegStr HKCU "$2" ".apng" "" + WriteRegStr HKCU "$2" ".bmp" "" + WriteRegStr HKCU "$2" ".flac" "" + WriteRegStr HKCU "$2" ".gif" "" + WriteRegStr HKCU "$2" ".htm" "" + WriteRegStr HKCU "$2" ".html" "" + WriteRegStr HKCU "$2" ".ico" "" + WriteRegStr HKCU "$2" ".jfif" "" + WriteRegStr HKCU "$2" ".jpeg" "" + WriteRegStr HKCU "$2" ".jpg" "" + WriteRegStr HKCU "$2" ".json" "" + WriteRegStr HKCU "$2" ".m4a" "" + WriteRegStr HKCU "$2" ".mp3" "" + WriteRegStr HKCU "$2" ".oga" "" + WriteRegStr HKCU "$2" ".ogg" "" + WriteRegStr HKCU "$2" ".ogv" "" + WriteRegStr HKCU "$2" ".opus" "" + WriteRegStr HKCU "$2" ".pdf" "" + WriteRegStr HKCU "$2" ".pjpeg" "" + WriteRegStr HKCU "$2" ".pjp" "" + WriteRegStr HKCU "$2" ".png" "" + WriteRegStr HKCU "$2" ".rdf" "" + WriteRegStr HKCU "$2" ".shtml" "" + WriteRegStr HKCU "$2" ".svg" "" + WriteRegStr HKCU "$2" ".webm" "" + WriteRegStr HKCU "$2" ".avif" "" + WriteRegStr HKCU "$2" ".xht" "" + WriteRegStr HKCU "$2" ".xhtml" "" + WriteRegStr HKCU "$2" ".xml" "" + ${EndIf} +FunctionEnd + +; Set the AUMID to all links pointing to our exe in a certain directory. +; See RegisterAumid. +Function RegisterAumidDirectory + Pop $0 + FindFirst $1 $2 "$0\*.lnk" + loop: + IfErrors end + ShellLink::GetShortCutTarget "$0\$2" + ; Do not pop, and pass the value over + Call GetPathFromString + Pop $3 + ${If} $3 == "$INSTDIR\${EXE_NAME}" + ApplicationID::Set "$0\$2" "$aumid" "true" + ${EndIf} + FindNext $1 $2 + goto loop + end: + FindClose $1 +FunctionEnd + +; Firefox expects the installer to write its AUMID in the registry. +; It is hardcoded to use Software\Mozilla\Firefox\TaskBarIDs, but we change it +; in widget/windows/WinTaskbar.cpp in one of our patches. +; See InitHashAppModelId in toolkit/mozapps/installer/windows/nsis/common.nsh. +; +; In addition to that, we need to associate the AUMID to every link as per +; specifications: +; https://learn.microsoft.com/en-us/windows/win32/shell/appids#application-de… +Function RegisterAumid + StrCpy $0 "Software\${APP_DIR}\${PROJECT_NAME}\TaskBarIDs" + WriteRegStr HKCU "$0" "$INSTDIR" "$aumid" + + Push $DESKTOP + Call RegisterAumidDirectory + Push "$QUICKLAUNCH\User Pinned\TaskBar" + Call RegisterAumidDirectory + Push "$QUICKLAUNCH\User Pinned\StartMenu" + Call RegisterAumidDirectory +FunctionEnd + +; Sets all the needed registry keys during an install, or run all the needed +; maintenance in the post update. +Function UpdateRegistry + Call SetUninstallData + Call ComputeAumid + ${If} $aumid != "error" + Call RegisterClasses + Call RegisterStartMenu + Call RegisterTypes + Call RegisterAumid + ${EndIf} +FunctionEnd + +;-------------------------------- +; Uninstall helper +; We do not ship an uninstaller in the updates. +; However, to be able to undo changes done during the post update step, we call +; `postupdate.exe` with the `/Uninstall`. They are implemented here. +; `postupdate.exe` always runs as it was an installer, which is the reason for +; which the following functions do not have the `un.` prefix. +; However, they have an `Un` suffix, and each `Un$function` function undoes the +; changes done by the corresponding `$function` function. + +Function UnregisterClass + Pop $0 ; Class name + StrCpy $1 "${NAME_NO_SPACES}$0-$aumid" ; Expanded class name + DeleteRegKey HKCU "Software\Classes\$1" +FunctionEnd + +Function UnregisterClasses + Push "URL" + Call UnregisterClass + Push "HTML" + Call UnregisterClass + Push "PDF" + Call UnregisterClass +FunctionEnd + +Function UnregisterStartMenu + DeleteRegValue HKCU "Software\RegisteredApplications" "${NAME_NO_SPACES}-$aumid" + DeleteRegKey HKCU "Software\Clients\StartMenuInternet\${NAME_NO_SPACES}-$aumid" +FunctionEnd + +Function UnregisterTypes + StrCpy $0 "Software\Classes\Applications\${EXE_NAME}" + StrCpy $1 "$0\shell\open\command" + ReadRegStr $2 HKCU "$1" "" + ${If} $2 != "" + Push $2 + Call GetPathFromString + Pop $3 + ; Do not do anything if we are not the installation that created the keys. + ${If} $3 == "$INSTDIR\${EXE_NAME}" + DeleteRegKey HKCU "$0" + ${EndIf} + ${EndIf} +FunctionEnd + +Function UnregisterAumid + DeleteRegValue HKCU "Software\${APP_DIR}\${PROJECT_NAME}\TaskBarIDs" "$INSTDIR" + ; No need to do anything on the links, as they will be deleted. +FunctionEnd + +; Remove all the registry changes we have done. +Function ClearRegistry + Call ComputeAumid + ${If} $aumid != "error" + ; We take for granted we do not have conflicting aumids. + Call UnregisterClasses + Call UnregisterStartMenu + Call UnregisterAumid + ${EndIf} + ; The types do not depend on the AUMID. So, even though we add them only + ; when we have an AUMID (they would be useless otherwise), we always check if + ; we should remove them. + Call UnregisterTypes +FunctionEnd ===================================== projects/firefox/build ===================================== @@ -6,7 +6,8 @@ }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build -mkdir -p [% dest_dir _ '/' _ c('filename') %] +[% SET out_dir = dest_dir _ '/' _ c('filename') -%] +mkdir -p [% out_dir %] [% IF c("var/windows") -%] # Setting up fxc2 @@ -276,6 +277,20 @@ cp -L obj-*/dist/bin/geckodriver* $distdir [% END -%] [% END -%] +[% IF c("var/mullvad-browser") && c("var/windows") -%] + function make_nsis_plugin { + pushd "other-licenses/nsis/Contrib/$1" + make CXX=[% c("arch") %]-w64-mingw32-clang++ + cp "$1.dll" $distdir/nsis-plugins/ + [% c("touch") %] "$distdir/nsis-plugins/$1.dll" + popd + } + + mkdir -p $distdir/nsis-plugins + make_nsis_plugin ApplicationID + make_nsis_plugin CityHash +[% END -%] + cd $distdir [% IF c("var/linux") -%] @@ -328,7 +343,7 @@ echo "Starting to package artifacts $(date)" [% c('tar', { tar_src => [ browserdir ], - tar_args => '-caf ' _ dest_dir _ '/' _ c('filename') _ '/browser.tar.' _ c('compress_tar'), + tar_args => '-caf ' _ out_dir _ '/browser.tar.' _ c('compress_tar'), }) %] # Debug symbols @@ -339,13 +354,13 @@ echo "Starting to package artifacts $(date)" mv include [% c('var/project-name') %]/ [% c('tar', { tar_src => [ c('var/project-name') ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/browser-debug-symbols.tar.xz', + tar_args => '-cJf ' _ out_dir _ '/browser-debug-symbols.tar.xz', }) %] popd [% ELSIF c("var/windows") -%] [% c('zip', { zip_src => [ 'Debug' ], - zip_args => dest_dir _ '/' _ c('filename') _ '/browser-debug-symbols.zip', + zip_args => out_dir _ '/browser-debug-symbols.zip', }) %] [% END -%] @@ -354,12 +369,12 @@ llvm-strip geckodriver* [% IF c("var/windows") -%] [% c('zip', { zip_src => [ 'geckodriver.exe' ], - zip_args => dest_dir _ '/' _ c('filename') _ '/geckodriver.zip', + zip_args => out_dir _ '/geckodriver.zip', }) %] [% ELSE -%] [% c('tar', { tar_src => [ 'geckodriver' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver.tar.xz', + tar_args => '-cJf ' _ out_dir _ '/geckodriver.tar.xz', }) %] [% END -%] @@ -367,12 +382,19 @@ llvm-strip geckodriver* [% IF c("var/updater_enabled") -%] [% c('zip', { zip_src => [ 'mar-tools' ], - zip_args => dest_dir _ '/' _ c('filename') _ '/' _ 'mar-tools-' _ c("var/osname") _ '-' _ c("var/torbrowser_version") _ '.zip', + zip_args => out_dir _ '/' _ 'mar-tools-' _ c("var/osname") _ '-' _ c("var/torbrowser_version") _ '.zip', + }) %] +[% END -%] + +[% IF c("var/mullvad-browser") && c("var/windows") -%] + [% c('tar', { + tar_src => [ 'nsis-plugins' ], + tar_args => '-caf ' _ out_dir _ '/nsis-plugins.tar.' _ c('compress_tar'), }) %] [% END -%] [% IF c("var/build_infos_json") -%] - cat > "[% dest_dir _ '/' _ c('filename') _ '/build-infos.json' %]" << EOF_BUILDINFOS + cat > "[% out_dir _ '/build-infos.json' %]" << EOF_BUILDINFOS { "firefox_platform_version" : "[% c("var/firefox_platform_version") %]", "firefox_buildid" : "$MOZ_BUILD_DATE" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.0-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 572c0bd7 by Henry Wilkes at 2024-03-05T16:48:52+00:00 fixup! Add TorStrings module for localization Bug 42305: Tidy up stable strings, ready for new translation CI. Cherry-picked from Bug 42221: Remove unused strings now that 13.0 is stable. Plus removed aboutTor.dtd after Bug 41333. - - - - - 7 changed files: - toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - − toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd - toolkit/torbutton/chrome/locale/en-US/settings.properties - toolkit/torbutton/chrome/locale/en-US/torConnect.properties - toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - toolkit/torbutton/chrome/locale/en-US/torbutton.properties - toolkit/torbutton/chrome/locale/en-US/torlauncher.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd ===================================== @@ -7,9 +7,6 @@ <!ENTITY aboutTBUpdate.version "Version"> <!ENTITY aboutTBUpdate.releaseDate "Release Date"> <!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> - - -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated.">  - - - - -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> - -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> - -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> - -<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Questions?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> - -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> - -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> - -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> - -<!ENTITY aboutTor.alpha.ready.label "Test. Thoroughly."> -<!ENTITY aboutTor.alpha.ready2.label "You’re ready to test the world’s most private browsing experience."> -<!ENTITY aboutTor.alpha.bannerDescription "Tor Browser Alpha is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release."> -<!ENTITY aboutTor.alpha.bannerLink "Report a bug on the Tor Forum"> - -<!ENTITY aboutTor.nightly.ready.label "Test. Thoroughly."> -<!ENTITY aboutTor.nightly.ready2.label "You’re ready to test the world’s most private browsing experience."> -<!ENTITY aboutTor.nightly.bannerDescription "Tor Browser Nightly is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release."> -<!ENTITY aboutTor.nightly.bannerLink "Report a bug on the Tor Forum"> ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -26,8 +26,6 @@ settings.quickstartCheckbox=Always connect automatically # Bridge settings settings.bridgesHeading=Bridges -# Old description used up to 12.0 - TODO: remove when 12.5 becomes stable: -settings.bridgesDescription=Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. settings.bridgesDescription2=Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. settings.bridgeLocation=Your location settings.bridgeLocationAutomatic=Automatic @@ -88,15 +86,6 @@ settings.builtinBridgeMeekAzureDescription2=Makes it look like you’re connecte settings.bridgeButtonConnect=Connect settings.bridgeButtonAccept=OK -# Old dialog strings used up to 12.0 - TODO: remove when 12.5 becomes stable: -settings.builtinBridgeTitle=Built-In Bridges -settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”. -settings.builtinBridgeObfs4=obfs4 -settings.builtinBridgeObfs4Description=obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges. -settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers. -settings.builtinBridgeMeekAzureDescription=meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor. -# end - # Request bridges dialog settings.requestBridgeDialogTitle=Request Bridge settings.submitCaptcha=Submit @@ -132,7 +121,3 @@ settings.allowedPortsPlaceholder=Comma-separated values # Log dialog settings.torLogDialogTitle=Tor Logs settings.copyLog=Copy Tor Log to Clipboard - -# Legacy strings - remove once 12.0 has gone EOL -settings.provideBridgeTitle=Provide Bridge -settings.provideBridgeHeader=Enter bridge information from a trusted source ===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -52,12 +52,3 @@ torConnect.autoBootstrappingFailed=Automatic configuration failed torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked torConnect.cannotDetermineCountry=Unable to determine user country torConnect.noSettingsForCountry=No settings available for your location - -# Urlbar strings used up to 12.0 - TODO: remove when 12.5 becomes stable: -torConnect.torNotConnectedConcise=Not Connected -torConnect.torConnectingConcise=Connecting… -torConnect.torConnectedConcise=Connected - -# connectMessage strings used up to 12.0 - TODO: remove when 12.5 becomes stable: -torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network -torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.dtd ===================================== @@ -8,9 +8,6 @@ <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> - -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -22,25 +22,6 @@ torbutton.circuit_display.region-guard-node = %S (guard) torbutton.circuit_display.new-circuit-guard-description = Your guard node may not change torbutton.circuit_display.new-circuit-bridge-description = Your bridge may not change -# Old circuit display strings used up to 12.0 - remove when 12.5 becomes stable: -torbutton.circuit_display.relay = Relay -torbutton.circuit_display.unknown_country = Unknown country -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. -torbutton.circuit_display.learn_more = Learn more -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! -# end - -# External app blocker strings used up to 12.0 - TODO: remove when 12.5 becomes stable: -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file -torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Automatically download files from now on - # Download pane warning torbutton.download.warning.title = Be careful opening downloads # %S will be a link to the Tails operating system website. With the content given by torbutton.download.warning.tails_brand_name @@ -131,18 +112,3 @@ profileProblemTitle=%S Profile Problem profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. - -# New identity warning -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? - - -## Legacy - -# Preferences for mobile: these strings are still referenced, but we should -# check whether this feature is still used -torbutton.security_settings.menu.title = Security Settings - -# The notification that appears when maximizing the browser with letterboxing disabled -# TODO: This string is not needed as of 12.5a5, and has a replacement in Base Browser! -# To be removed when 12.0 will not need new updates. -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. ===================================== toolkit/torbutton/chrome/locale/en-US/torlauncher.properties ===================================== @@ -59,7 +59,3 @@ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. - -## 12.5-only strings that can be removed once it goes EOL. - -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/572c0bd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/572c0bd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: bbf5383c by hackademix at 2024-03-06T18:20:36+01:00 Bug 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 6 changed files: - browser/app/profile/001-base-profile.js - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/windowwatcher/nsWindowWatcher.cpp - xpfe/appshell/AppWindow.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -379,6 +379,8 @@ pref("privacy.resistFingerprinting.letterboxing", true); pref("privacy.resistFingerprinting.letterboxing.vcenter", true); // tor-browser#41917 letterboxing gradient background pref("privacy.resistFingerprinting.letterboxing.gradient", true); +// tor-browser#41918: should we reuse last window sizes if letterboxing is enabled +pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: how many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); // tor-browser#33282: new windows start at 1400x900 when there's enough screen space, otherwise down by 200x100 blocks ===================================== dom/base/nsContentUtils.cpp ===================================== @@ -2663,6 +2663,18 @@ void nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting( *aOutputHeight = resultHeight; } +bool nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting() { + return !( + Preferences::GetBool("privacy.resistFingerprinting.letterboxing", + false) && + // We want to round window size at least once in the browser's life time: + // AppWindow::ForceRoundedDimensions() will set this preference to true. + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.didForceSize", false) && + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.rememberSize", false)); +} + bool nsContentUtils::ThreadsafeIsCallerChrome() { return NS_IsMainThread() ? IsCallerChrome() : IsCurrentThreadRunningChromeWorker(); ===================================== dom/base/nsContentUtils.h ===================================== @@ -406,6 +406,10 @@ class nsContentUtils { bool aSetOuterWidth, bool aSetOuterHeight, int32_t* aOutputWidth, int32_t* aOutputHeight); + // Tell if we actually want to round size of new windows for RFP, + // depending on letterboxing status and user's preference. + static bool ShouldRoundWindowSizeForResistingFingerprinting(); + /** * Returns the parent node of aChild crossing document boundaries, but skips * any cross-process parent frames and continues with the nearest in-process ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -18,6 +18,8 @@ const kPrefLetterboxingVcenter = "privacy.resistFingerprinting.letterboxing.vcenter"; const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; +const kPrefLetterboxingDidForceSize = + "privacy.resistFingerprinting.letterboxing.didForceSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -221,6 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -228,6 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); ===================================== toolkit/components/windowwatcher/nsWindowWatcher.cpp ===================================== @@ -2333,7 +2333,9 @@ static void SizeOpenedWindow(nsIDocShellTreeOwner* aTreeOwner, screenDesktopRect.Size() / screenCssToDesktopScale; if (aSizeSpec.SizeSpecified()) { - if (!nsContentUtils::ShouldResistFingerprinting()) { + if (!(nsContentUtils::ShouldResistFingerprinting() && + nsContentUtils:: + ShouldRoundWindowSizeForResistingFingerprinting())) { /* Unlike position, force size out-of-bounds check only if size actually was specified. Otherwise, intrinsically sized windows are broken. */ ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -1123,8 +1123,9 @@ NS_IMETHODIMP AppWindow::GetAvailScreenSize(int32_t* aAvailWidth, return NS_OK; } -// Rounds window size to 1000x1000, or, if there isn't enough available -// screen space, to a multiple of 200x100. +// Rounds window size to privacy.window.maxInnerWidth x +// privacy.window.maxInnerWidth, or, if there isn't enough available screen +// space, to a multiple of 200x100. NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { if (mIsHiddenWindow) { return NS_OK; @@ -1164,6 +1165,11 @@ NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { SetPrimaryContentSize(targetSizeDev.width, targetSizeDev.height); + // Ensure we force initial rounded size at least once, as checked by + // nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting(). + Preferences::SetBool("privacy.resistFingerprinting.letterboxing.didForceSize", + true); + return NS_OK; } @@ -2703,7 +2709,8 @@ void AppWindow::SizeShell() { if (nsContentUtils::ShouldResistFingerprinting( "if RFP is enabled we want to round the dimensions of the new" "new pop up window regardless of their origin") && - windowType.EqualsLiteral("navigator:browser")) { + windowType.EqualsLiteral("navigator:browser") && + nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting()) { // Once we've got primary content, force dimensions. if (mPrimaryContentShell || mPrimaryBrowserParent) { ForceRoundedDimensions(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/bbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/bbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f3ff4275 by hackademix at 2024-03-06T18:18:16+01:00 Bug 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 6 changed files: - browser/app/profile/001-base-profile.js - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/windowwatcher/nsWindowWatcher.cpp - xpfe/appshell/AppWindow.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -380,6 +380,8 @@ pref("privacy.resistFingerprinting.letterboxing", true); pref("privacy.resistFingerprinting.letterboxing.vcenter", true); // tor-browser#41917 letterboxing gradient background pref("privacy.resistFingerprinting.letterboxing.gradient", true); +// tor-browser#41918: should we reuse last window sizes if letterboxing is enabled +pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: how many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); // tor-browser#33282: new windows start at 1400x900 when there's enough screen space, otherwise down by 200x100 blocks ===================================== dom/base/nsContentUtils.cpp ===================================== @@ -2663,6 +2663,18 @@ void nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting( *aOutputHeight = resultHeight; } +bool nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting() { + return !( + Preferences::GetBool("privacy.resistFingerprinting.letterboxing", + false) && + // We want to round window size at least once in the browser's life time: + // AppWindow::ForceRoundedDimensions() will set this preference to true. + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.didForceSize", false) && + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.rememberSize", false)); +} + bool nsContentUtils::ThreadsafeIsCallerChrome() { return NS_IsMainThread() ? IsCallerChrome() : IsCurrentThreadRunningChromeWorker(); ===================================== dom/base/nsContentUtils.h ===================================== @@ -406,6 +406,10 @@ class nsContentUtils { bool aSetOuterWidth, bool aSetOuterHeight, int32_t* aOutputWidth, int32_t* aOutputHeight); + // Tell if we actually want to round size of new windows for RFP, + // depending on letterboxing status and user's preference. + static bool ShouldRoundWindowSizeForResistingFingerprinting(); + /** * Returns the parent node of aChild crossing document boundaries, but skips * any cross-process parent frames and continues with the nearest in-process ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -18,6 +18,8 @@ const kPrefLetterboxingVcenter = "privacy.resistFingerprinting.letterboxing.vcenter"; const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; +const kPrefLetterboxingDidForceSize = + "privacy.resistFingerprinting.letterboxing.didForceSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -221,6 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -228,6 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); ===================================== toolkit/components/windowwatcher/nsWindowWatcher.cpp ===================================== @@ -2333,7 +2333,9 @@ static void SizeOpenedWindow(nsIDocShellTreeOwner* aTreeOwner, screenDesktopRect.Size() / screenCssToDesktopScale; if (aSizeSpec.SizeSpecified()) { - if (!nsContentUtils::ShouldResistFingerprinting()) { + if (!(nsContentUtils::ShouldResistFingerprinting() && + nsContentUtils:: + ShouldRoundWindowSizeForResistingFingerprinting())) { /* Unlike position, force size out-of-bounds check only if size actually was specified. Otherwise, intrinsically sized windows are broken. */ ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -1123,8 +1123,9 @@ NS_IMETHODIMP AppWindow::GetAvailScreenSize(int32_t* aAvailWidth, return NS_OK; } -// Rounds window size to 1000x1000, or, if there isn't enough available -// screen space, to a multiple of 200x100. +// Rounds window size to privacy.window.maxInnerWidth x +// privacy.window.maxInnerWidth, or, if there isn't enough available screen +// space, to a multiple of 200x100. NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { if (mIsHiddenWindow) { return NS_OK; @@ -1164,6 +1165,11 @@ NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { SetPrimaryContentSize(targetSizeDev.width, targetSizeDev.height); + // Ensure we force initial rounded size at least once, as checked by + // nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting(). + Preferences::SetBool("privacy.resistFingerprinting.letterboxing.didForceSize", + true); + return NS_OK; } @@ -2703,7 +2709,8 @@ void AppWindow::SizeShell() { if (nsContentUtils::ShouldResistFingerprinting( "if RFP is enabled we want to round the dimensions of the new" "new pop up window regardless of their origin") && - windowType.EqualsLiteral("navigator:browser")) { + windowType.EqualsLiteral("navigator:browser") && + nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting()) { // Once we've got primary content, force dimensions. if (mPrimaryContentShell || mPrimaryBrowserParent) { ForceRoundedDimensions(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3ff427… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3ff427… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f4471d9f by hackademix at 2024-03-06T16:53:19+00:00 Bug 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 6 changed files: - browser/app/profile/001-base-profile.js - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/windowwatcher/nsWindowWatcher.cpp - xpfe/appshell/AppWindow.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -380,6 +380,8 @@ pref("privacy.resistFingerprinting.letterboxing", true); pref("privacy.resistFingerprinting.letterboxing.vcenter", true); // tor-browser#41917 letterboxing gradient background pref("privacy.resistFingerprinting.letterboxing.gradient", true); +// tor-browser#41918: should we reuse last window sizes if letterboxing is enabled +pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: how many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); // tor-browser#33282: new windows start at 1400x900 when there's enough screen space, otherwise down by 200x100 blocks ===================================== dom/base/nsContentUtils.cpp ===================================== @@ -2663,6 +2663,18 @@ void nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting( *aOutputHeight = resultHeight; } +bool nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting() { + return !( + Preferences::GetBool("privacy.resistFingerprinting.letterboxing", + false) && + // We want to round window size at least once in the browser's life time: + // AppWindow::ForceRoundedDimensions() will set this preference to true. + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.didForceSize", false) && + Preferences::GetBool( + "privacy.resistFingerprinting.letterboxing.rememberSize", false)); +} + bool nsContentUtils::ThreadsafeIsCallerChrome() { return NS_IsMainThread() ? IsCallerChrome() : IsCurrentThreadRunningChromeWorker(); ===================================== dom/base/nsContentUtils.h ===================================== @@ -406,6 +406,10 @@ class nsContentUtils { bool aSetOuterWidth, bool aSetOuterHeight, int32_t* aOutputWidth, int32_t* aOutputHeight); + // Tell if we actually want to round size of new windows for RFP, + // depending on letterboxing status and user's preference. + static bool ShouldRoundWindowSizeForResistingFingerprinting(); + /** * Returns the parent node of aChild crossing document boundaries, but skips * any cross-process parent frames and continues with the nearest in-process ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -18,6 +18,8 @@ const kPrefLetterboxingVcenter = "privacy.resistFingerprinting.letterboxing.vcenter"; const kPrefLetterboxingGradient = "privacy.resistFingerprinting.letterboxing.gradient"; +const kPrefLetterboxingDidForceSize = + "privacy.resistFingerprinting.letterboxing.didForceSize"; const kTopicDOMWindowOpened = "domwindowopened"; @@ -221,6 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -228,6 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: + Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); ===================================== toolkit/components/windowwatcher/nsWindowWatcher.cpp ===================================== @@ -2333,7 +2333,9 @@ static void SizeOpenedWindow(nsIDocShellTreeOwner* aTreeOwner, screenDesktopRect.Size() / screenCssToDesktopScale; if (aSizeSpec.SizeSpecified()) { - if (!nsContentUtils::ShouldResistFingerprinting()) { + if (!(nsContentUtils::ShouldResistFingerprinting() && + nsContentUtils:: + ShouldRoundWindowSizeForResistingFingerprinting())) { /* Unlike position, force size out-of-bounds check only if size actually was specified. Otherwise, intrinsically sized windows are broken. */ ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -1123,8 +1123,9 @@ NS_IMETHODIMP AppWindow::GetAvailScreenSize(int32_t* aAvailWidth, return NS_OK; } -// Rounds window size to 1000x1000, or, if there isn't enough available -// screen space, to a multiple of 200x100. +// Rounds window size to privacy.window.maxInnerWidth x +// privacy.window.maxInnerWidth, or, if there isn't enough available screen +// space, to a multiple of 200x100. NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { if (mIsHiddenWindow) { return NS_OK; @@ -1164,6 +1165,11 @@ NS_IMETHODIMP AppWindow::ForceRoundedDimensions() { SetPrimaryContentSize(targetSizeDev.width, targetSizeDev.height); + // Ensure we force initial rounded size at least once, as checked by + // nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting(). + Preferences::SetBool("privacy.resistFingerprinting.letterboxing.didForceSize", + true); + return NS_OK; } @@ -2703,7 +2709,8 @@ void AppWindow::SizeShell() { if (nsContentUtils::ShouldResistFingerprinting( "if RFP is enabled we want to round the dimensions of the new" "new pop up window regardless of their origin") && - windowType.EqualsLiteral("navigator:browser")) { + windowType.EqualsLiteral("navigator:browser") && + nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting()) { // Once we've got primary content, force dimensions. if (mPrimaryContentShell || mPrimaryBrowserParent) { ForceRoundedDimensions(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4471d9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4471d9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 187a1c0b by Pier Angelo Vendrame at 2024-03-06T17:41:34+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - fd5f4778 by Pier Angelo Vendrame at 2024-03-06T17:41:45+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -654,7 +654,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/82… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/82… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d89c5260 by Pier Angelo Vendrame at 2024-03-06T17:40:57+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - 047d94e4 by Pier Angelo Vendrame at 2024-03-06T17:41:06+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -656,7 +656,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/01ceac… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/01ceac… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 406293f5 by Pier Angelo Vendrame at 2024-03-06T11:30:40+01:00 fixup! Firefox preference overrides. Bug 42377: Hidden fonts should obey the allow list. Remove .Helvetica Neue DeskInterface from the allow list. This font might not be actually available, and in any case fonts starting with period will not be displayed by the browser. - - - - - a8c62f72 by Pier Angelo Vendrame at 2024-03-06T17:00:49+01:00 Bug 42377: Hidden fonts should obey the allow list. Hidden font families were automatically added to the `font.system.whitelist`, which is a behavior that conflicts with our font picking. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -656,7 +656,7 @@ pref("toolkit.winRegisterApplicationRestart", false); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi"); // Armenian pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman"); ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -401,12 +401,6 @@ void gfxPlatformFontList::ApplyWhitelist() { AutoTArray<RefPtr<gfxFontFamily>, 128> accepted; bool whitelistedFontFound = false; for (const auto& entry : mFontFamilies) { - if (entry.GetData()->IsHidden()) { - // Hidden system fonts are exempt from whitelisting, but don't count - // towards determining whether we "kept" any (user-visible) fonts - accepted.AppendElement(entry.GetData()); - continue; - } nsAutoCString fontFamilyName(entry.GetKey()); ToLowerCase(fontFamilyName); if (familyNamesWhitelist.Contains(fontFamilyName)) { @@ -442,8 +436,7 @@ void gfxPlatformFontList::ApplyWhitelist( AutoTArray<fontlist::Family::InitData, 128> accepted; bool keptNonHidden = false; for (auto& f : aFamilies) { - if (f.mVisibility == FontVisibility::Hidden || - familyNamesWhitelist.Contains(f.mKey)) { + if (familyNamesWhitelist.Contains(f.mKey)) { accepted.AppendElement(f); if (f.mVisibility != FontVisibility::Hidden) { keptNonHidden = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a85148… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a85148… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.0.11
by richard (＠richard) 06 Mar '24

06 Mar '24

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 5c370af8 by Richard Pospesel at 2024-03-06T12:51:03+00:00 release: new version, 13.0.11 - - - - - 30 changed files: - update_3/release/.htaccess - + update_3/release/13.0.10-13.0.11-linux-i686-ALL.xml - + update_3/release/13.0.10-13.0.11-linux-x86_64-ALL.xml - + update_3/release/13.0.10-13.0.11-macos-ALL.xml - + update_3/release/13.0.10-13.0.11-windows-i686-ALL.xml - + update_3/release/13.0.10-13.0.11-windows-x86_64-ALL.xml - − update_3/release/13.0.10-linux-i686-ALL.xml - − update_3/release/13.0.10-linux-x86_64-ALL.xml - − update_3/release/13.0.10-macos-ALL.xml - − update_3/release/13.0.10-windows-i686-ALL.xml - − update_3/release/13.0.10-windows-x86_64-ALL.xml - + update_3/release/13.0.11-linux-i686-ALL.xml - + update_3/release/13.0.11-linux-x86_64-ALL.xml - + update_3/release/13.0.11-macos-ALL.xml - + update_3/release/13.0.11-windows-i686-ALL.xml - + update_3/release/13.0.11-windows-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.10-linux-i686-ALL.xml - − update_3/release/13.0.7-13.0.10-linux-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.10-macos-ALL.xml - − update_3/release/13.0.7-13.0.10-windows-i686-ALL.xml - − update_3/release/13.0.7-13.0.10-windows-x86_64-ALL.xml - − update_3/release/13.0.8-13.0.10-linux-i686-ALL.xml - − update_3/release/13.0.8-13.0.10-linux-x86_64-ALL.xml - − update_3/release/13.0.8-13.0.10-macos-ALL.xml - − update_3/release/13.0.8-13.0.10-windows-i686-ALL.xml - − update_3/release/13.0.8-13.0.10-windows-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.11-linux-i686-ALL.xml - + update_3/release/13.0.8-13.0.11-linux-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.11-macos-ALL.xml - + update_3/release/13.0.8-13.0.11-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… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0.11-build1
by richard (＠richard) 05 Mar '24

05 Mar '24

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

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41101: Prepare Tor Browser Stable 13.0.11.
by richard (＠richard) 05 Mar '24

05 Mar '24

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 3a0bc8e6 by Pier Angelo Vendrame at 2024-03-05T17:38:36+01:00 Bug 41101: Prepare Tor Browser Stable 13.0.11. This is a Tor Browser-only release to update the domain front CDN. - - - - - 7 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox-android/config - projects/firefox/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,59 @@ +Tor Browser 13.0.11 - March 06 2024 + * All Platforms + * Bug 42435: Update moat domain fronting configuration [tor-browser] + * Build System + * All Platforms + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + +Tor Browser 13.5a5 - February 28 2024 + * All Platforms + * Updated OpenSSL to 3.0.13 + * Updated Snowflake to 2.9.0 + * Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser] + * Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser] + * Bug 42390: Betterboxing: make the decorator border disappear when the corners are flat [tor-browser] + * Bug 42397: Change RFP-spoofed Timezone from UTC to a real-world, less discriminable one [tor-browser] + * Bug 42412: Rebase Tor Browser Alpha onto 115.8.0esr [tor-browser] + * Bug 41079: Bump version of Snowflake to v2.9.0 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.8.0esr + * Bug 41814: Change "vanilla bridge:" to "Tor bridge:" in bridge cards [tor-browser] + * Bug 42270: Implement design changes to QR code dialog [tor-browser] + * Bug 42389: Betterboxing: gradient is never shown [tor-browser] + * Bug 42398: Include Alpha and Nightly in MOZ_APP_DISPLAYNAME (and possibly in other places) [tor-browser] + * Bug 42414: Show ellipsis when the tor bridge address overflows [tor-browser] + * Bug 42415: Improve focus styling for forced focus in bridge settings [tor-browser] + * Bug 42421: Remove bridge option should be hidden for Lox bridges [tor-browser] + * Bug 42423: Move temporary Lox Fluent strings to new file [tor-browser] + * Bug 42425: Improve accessibility of the bridge emoji cells [tor-browser] + * Android + * Updated GeckoView to 115.8.0esr + * Bug 42253: Remove "New private tab" action and widget [tor-browser] + * Bug 42402: Remove Android YEC strings [tor-browser] + * Bug 42407: TTP-03-010 WP3: Potential phishing [tor-browser] + * Bug 42416: Backport Android security fixes from Firefox 123 [tor-browser] + * macOS + * Bug 40569: Create build-specific installer for macOS [tor-browser-build] + * Build System + * All Platforms + * Updated Go to 1.20.14 and 1.21.7 + * Bug 41081: Update detailsURL in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 40068: Switch from IO::CaptureOutput to Capture::Tiny [rbm] + * Bug 40069: Make stdout and stderr utf8 [rbm] + * Bug 40071: Add an option to create zip files using 7z [rbm] + * Bug 40072: Move capture_exec to a separate module [rbm] + * Windows + * Bug 41076: Include the ShellLink plugin in NSIS [tor-browser-build] + * macOS + * Bug 41084: $app_bundle is missing the final .app in projects/firefox/build [tor-browser-build] + * Android + * Bug 42399: Re-enable minimization of JS for Android [tor-browser] + * Bug 41080: Re-pack omni.ja with 7-zip on Android [tor-browser-build] + * Bug 41092: Use an uncompressed omni.ja to improve final apk compression. [tor-browser-build] + * Bug 41093: Sign unsigned APKs instead of the QA-signed ones [tor-browser-build] + Tor Browser 13.0.10 - February 20 2024 * All Platforms * Updated OpenSSL to 3.0.13 @@ -239,7 +295,6 @@ Tor Browser 13.5a2 - November 27 2023 * Bug 42302: The allowed ports string contains a typo [tor-browser] * Windows + macOS + Linux * Updated Firefox to 115.5.0esr - * Bug 42231: Improve the network monitor patch for http onion resources [tor-browser] * Bug 42072: YEC 2023 Takeover for Desktop Stable [tor-browser] * Bug 42188: Donations are asked repeatedly when I click New identity button [tor-browser] * Bug 42194: Blank Net Error page on name resolution failure [tor-browser] ===================================== projects/browser/allowed_addons.json ===================================== @@ -11,13 +11,13 @@ "authors": [ { "id": 13299734, - "name": "Alexander Shutau", + "name": "Dark Reader Ltd", "url": "https://addons.mozilla.org/en-US/firefox/user/13299734/", "username": "alexanderby", - "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" + "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1145406, + "average_daily_users": 1156101, "categories": { "firefox": [ "web-development", @@ -28,18 +28,18 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5688757, + "id": 5698881, "compatibility": { "firefox": { - "min": "54.0", + "min": "78.0", "max": "*" }, "android": { - "min": "54.0", + "min": "113.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56887…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56988…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +50,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Fixed errors when Adopted Stylesheets were not present.\n- Fixed breaking on ::view-transition selectors (Airbnb issue).\n- Users' fixes for websites." + "en-US": "- Optimized Adopted Style Sheets changes handling.\n- Fixed watching for style/link element position changes.\n- Fixed processing large style elements loaded by chunks.\n- Fixed enabling the extension with a hotkey after it was disabled automatically.\n- Fixed sliders in mobile UI.\n- Users' fixes for websites." }, - "reviewed": "2024-02-08T08:33:10Z", - "version": "4.9.77", + "reviewed": "2024-03-05T08:23:41Z", + "version": "4.9.78", "files": [ { - "id": 4233074, - "created": "2024-02-07T11:23:55Z", - "hash": "sha256:931de67e9091c69edd9fd3f348a7ed1de1dce7d136017fed641bd10eb0ae8891", + "id": 4243182, + "created": "2024-02-29T10:00:39Z", + "hash": "sha256:21e08b3f26e9b54257d30f6b2fb2d966d41ace54d2d79ccec55e55517084c7ce", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 725369, + "size": 727208, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4233074/darkreader-4.9.77…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4243182/darkreader-4.9.78…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +143,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-02-08T08:33:10Z", + "last_updated": "2024-03-05T08:23:41Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.543, - "bayesian_average": 4.541876920708902, - "count": 5422, - "text_count": 1714 + "average": 4.5383, + "bayesian_average": 4.537199119336593, + "count": 5475, + "text_count": 1727 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +318,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": 24238 + "weekly_downloads": 23635 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 266930, + "average_daily_users": 267126, "categories": { "firefox": [ "privacy-security" @@ -547,10 +547,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8027, - "bayesian_average": 4.798069751523067, - "count": 1404, - "text_count": 252 + "average": 4.7977, + "bayesian_average": 4.793130609775481, + "count": 1409, + "text_count": 254 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +635,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": 3379 + "weekly_downloads": 3273 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1230616, + "average_daily_users": 1233259, "categories": { "firefox": [ "privacy-security" @@ -1170,10 +1170,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7951, - "bayesian_average": 4.792379053678419, - "count": 2387, - "text_count": 454 + "average": 4.7974, + "bayesian_average": 4.79471376173004, + "count": 2399, + "text_count": 457 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1197,7 +1197,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": 22274 + "weekly_downloads": 20288 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 7720487, + "average_daily_users": 7782292, "categories": { "firefox": [ "privacy-security" @@ -1222,7 +1222,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5672315, + "id": 5693353, "compatibility": { "firefox": { "min": "78.0", @@ -1233,7 +1233,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/56…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1244,22 +1244,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/514b85ddd154153a63fe9c…" rel=\"nofollow\">1.55.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1e03af965f6b7a76aa94f6…" rel=\"nofollow\">Mind drop events in filter expression field of logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e018352ca30c61b4a80c2a…" rel=\"nofollow\">Improve <code>xml-prune</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ec6b213ac8c38077b676e1…" rel=\"nofollow\">Fix message entries overflowing in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a6311ada7aec5e36a802c2…" rel=\"nofollow\">Add support for <code>application/x-javascript</code> in <code>replace=</code> option</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8b0f4ac6d1a68a10f0736a…" rel=\"nofollow\">Extend support for differential updates to imported lists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5e2218ad38a67bad16b5a2…" rel=\"nofollow\">Add detection of mismatched <code>!#if</code>-<code>!#endif</code> in linter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d3d5708132bbca2b9b3232…" rel=\"nofollow\">Support links to update lists which are differential update-friendly</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5da8dae3bfc5fd15895013…" rel=\"nofollow\">Remove \"Purge all caches\" button from \"Filter lists\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f9bd0d08194525f2457cf5…" rel=\"nofollow\">Add support for <code>all</code> list token in updater-link feature</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f266c7ca3a6228a20999be…" rel=\"nofollow\">Fix logging of broad exception filter <code>#@#+js()</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/444dcf1f11a8dacef0553e…" rel=\"nofollow\">Improve <code>no-xhr-if</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5f699ca11537ba17c330a8…" rel=\"nofollow\">Ensure cache storage backend is selected before access</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/983fbc3b50419c274040d9…" rel=\"nofollow\">Fix popup panel rendering when embedded in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2f972ff52f4edc3dc99084…" rel=\"nofollow\">Add visual hint in support information re. differential update</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/75541b4012443bd5602cc0…" rel=\"nofollow\">Remove obsolete web accessible resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8eb76fbc2577032e63698e…" rel=\"nofollow\">Rename <code>urltransform</code> to <code>uritransform</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/43e266ca8d07228388c2a6…" rel=\"nofollow\">Vertically expand/collapse in steps in dom inspector</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d1f0669c5cf9357a9528d8…" rel=\"nofollow\">Reset the DOM inspector when URL in top context changes</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d2f70a310ccc2ce2b2c97c…" rel=\"nofollow\">Support shadow-piercing combinator <code>>>></code> in <code>trusted-click-element</code></a></li><li>[...]</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7d13ab8046ad75d1230ea5…" 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/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>" }, - "reviewed": "2024-01-08T10:26:54Z", - "version": "1.55.0", + "reviewed": "2024-02-20T18:51:52Z", + "version": "1.56.0", "files": [ { - "id": 4216633, - "created": "2024-01-03T20:24:50Z", - "hash": "sha256:a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647", + "id": 4237670, + "created": "2024-02-17T14:54:31Z", + "hash": "sha256:f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3647341, + "size": 3819727, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4216633/ublock_origin-1.5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5…", "permissions": [ "alarms", "dns", @@ -1379,7 +1379,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-02-02T17:55:27Z", + "last_updated": "2024-03-04T01:35:20Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1524,10 +1524,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7881, - "bayesian_average": 4.787723506381607, - "count": 17231, - "text_count": 4500 + "average": 4.7889, + "bayesian_average": 4.78852910141135, + "count": 17348, + "text_count": 4523 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1590,7 +1590,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": 177322 + "weekly_downloads": 164561 }, "notes": null }, @@ -1606,7 +1606,7 @@ "picture_url": null } ], - "average_daily_users": 178336, + "average_daily_users": 178548, "categories": { "firefox": [ "photos-music-videos", @@ -1702,10 +1702,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4586, - "bayesian_average": 4.453632190728077, - "count": 1197, - "text_count": 458 + "average": 4.4478, + "bayesian_average": 4.442927736258425, + "count": 1206, + "text_count": 462 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1727,7 +1727,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": 338 + "weekly_downloads": 351 }, "notes": null }, @@ -1743,7 +1743,7 @@ "picture_url": null } ], - "average_daily_users": 80426, + "average_daily_users": 78821, "categories": { "firefox": [ "privacy-security", @@ -1878,7 +1878,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": 1192 + "weekly_downloads": 1812 }, "notes": null }, @@ -1894,7 +1894,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 303170, + "average_daily_users": 307636, "categories": { "firefox": [ "search-tools", @@ -2111,10 +2111,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6486, - "bayesian_average": 4.644151267365882, - "count": 1406, - "text_count": 273 + "average": 4.6443, + "bayesian_average": 4.639930009440798, + "count": 1417, + "text_count": 274 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2137,7 +2137,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": 5685 + "weekly_downloads": 5954 }, "notes": null }, @@ -2160,7 +2160,7 @@ "picture_url": null } ], - "average_daily_users": 124960, + "average_daily_users": 124882, "categories": { "firefox": [ "search-tools", @@ -2441,10 +2441,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3708, - "bayesian_average": 4.3664252602275715, - "count": 1327, - "text_count": 375 + "average": 4.3743, + "bayesian_average": 4.369989496152543, + "count": 1336, + "text_count": 378 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2464,7 +2464,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": 23 + "weekly_downloads": 44 }, "notes": null }, @@ -2480,7 +2480,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 310960, + "average_daily_users": 309662, "categories": { "firefox": [ "web-development", @@ -2667,10 +2667,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3955, - "bayesian_average": 4.3928075540461755, - "count": 2172, - "text_count": 837 + "average": 4.396, + "bayesian_average": 4.393343568847512, + "count": 2182, + "text_count": 840 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2714,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": 7229 + "weekly_downloads": 7462 }, "notes": null }, @@ -2730,7 +2730,7 @@ "picture_url": null } ], - "average_daily_users": 162651, + "average_daily_users": 163018, "categories": { "firefox": [ "photos-music-videos", @@ -2839,10 +2839,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8749, - "bayesian_average": 3.8708093397361107, - "count": 1223, - "text_count": 444 + "average": 3.8731, + "bayesian_average": 3.8690686700002854, + "count": 1229, + "text_count": 445 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2861,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": 1653 + "weekly_downloads": 2750 }, "notes": null } ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.0-1 - browser_build: 13 + browser_build: 14 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.0' 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/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: 136210 +version: 148707 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: 6731381fd992cf65dd01e56e2b924005af633369da5ac9eb905fd8025255b386 + sha256sum: a765497eaec3a926823812930a78d25048a1df0c4d765b53e87888db09f5d8d8 - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: cbd9b6c415ec2edb99237ef67ccd4f033a7b9c2a + git_hash: 16211a4b8524d71525f0ea73c07771c634132b30 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: a50fa943d7428ebe6e4e6b09f175e098a97eec63 + git_hash: 012f643d2d6b04ebf868bf62cdb7ad5b727734f5 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: 57de1569da0e2c48fd999a13e555f6b522041993 + git_hash: c5361cb496ae7e047fd9226139537f1fcfc7938d targets: nightly: git_hash: 'mullvad-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: b0b9f5d6908c58e9492e6bdce9e8acdc493b178d + git_hash: e7d263c7ee81d7d9db3410ca880b1aeb107ef784 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -81,13 +81,14 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0.10' - torbrowser_build: '[% IF c("var/mullvad-browser") %]build2[% ELSE %]build1[% END %]' + torbrowser_version: '13.0.11' + torbrowser_build: 'build1' torbrowser_incremental_from: + # 13.0.11 is Tor Browser-only + - '13.0.10' - '13.0.9' - '[% IF c("var/tor-browser") %]13.0.8[% END %]' - - '13.0.7' - - '[% IF c("var/mullvad-browser") %]13.0.6[% END %]' + - '[% IF c("var/mullvad-browser") %]13.0.7[% END %]' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build14
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed new tag firefox-android-115.2.1-13.0-1-build14 at The Tor Project / Applications / firefox-android -- 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/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Update last commit date for tor-browser-build#40992
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: a36acf93 by Pier Angelo Vendrame at 2024-03-05T17:18:38+01:00 fixup! Update last commit date for tor-browser-build#40992 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a36… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a36… 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.8.0esr-13.0-1-build2
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed new tag tor-browser-115.8.0esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.0-1] fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: f4e58357 by Cecylia Bocovich at 2024-03-05T14:06:10+01:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 42435: Update moat domain fronting configuration - - - - - 1 changed file: - browser/app/profile/000-tor-browser.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -110,8 +110,8 @@ pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", ""); // BridgeDB-related preferences (used for Moat). -pref("extensions.torlauncher.bridgedb_front", "foursquare.com"); -pref("extensions.torlauncher.bridgedb_reflector", "https://moat.torproject.org.global.prod.fastly.net/"); +pref("extensions.torlauncher.bridgedb_front", "www.phpmyadmin.net"); +pref("extensions.torlauncher.bridgedb_reflector", "https://1723079976.rsc.cdn77.org"); pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat"); pref("extensions.torlauncher.bridgedb_bridge_type", "obfs4"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4e5835… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4e5835… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a8514843 by Cecylia Bocovich at 2024-03-05T13:05:31+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 42435: Update moat domain fronting configuration - - - - - 1 changed file: - browser/app/profile/000-tor-browser.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -109,6 +109,6 @@ pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", ""); // BridgeDB-related preferences (used for Moat). -pref("extensions.torlauncher.bridgedb_front", "foursquare.com"); -pref("extensions.torlauncher.bridgedb_reflector", "https://moat.torproject.org.global.prod.fastly.net/"); +pref("extensions.torlauncher.bridgedb_front", "www.phpmyadmin.net"); +pref("extensions.torlauncher.bridgedb_reflector", "https://1723079976.rsc.cdn77.org"); pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a851484… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a851484… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.0-1] fixup! MB 37: Customization for the about dialog
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a1340c13 by Pier Angelo Vendrame at 2024-03-05T13:59:07+01:00 fixup! MB 37: Customization for the about dialog MB 270: Update support email - - - - - 2 changed files: - browser/base/content/aboutDialog.xhtml - browser/locales/en-US/browser/aboutDialogMullvad.ftl Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -138,7 +138,7 @@ <description class="text-blurb"> <label is="text-link" href="https://mullvad.net/browser" data-l10n-id="mullvad-about-readMore"/> </description> - <description class="text-blurb" data-l10n-id="mullvad-about-feedback"/> + <description class="text-blurb" data-l10n-id="mullvad-about-feedback2" data-l10n-args='{"emailAddress":"support(a)mullvadvpn.net"}'/> </vbox> </vbox> </hbox> ===================================== browser/locales/en-US/browser/aboutDialogMullvad.ftl ===================================== @@ -4,5 +4,5 @@ mullvad-about-desc = { -brand-short-name } is a privacy-focused web browser developed in collaboration between <label data-l10n-name="mullvad-about-mullvadLink">Mullvad VPN</label> and the <label data-l10n-name="mullvad-about-torProjectLink">Tor Project</label>. It’s produced to minimize tracking and fingerprinting. mullvad-about-readMore = Read more -mullvad-about-feedback = Help & feedback: support(a)mullvad.net +mullvad-about-feedback2 = Help & feedback: { $emailAddress } mullvad-about-telemetryLink = Telemetry View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a13… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a13… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Add built-in bridge lines for Android.
by Pier Angelo Vendrame (＠pierov) 05 Mar '24

05 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c1b6d5ec by Pier Angelo Vendrame at 2024-03-05T13:55:49+01:00 fixup! Add built-in bridge lines for Android. Bug 42427: Do not ship bridges as prefences anymore. Revert "Add built-in bridge lines for Android." This reverts commit 5f61167d67c8b74bfb104229b9bc42a0bc6997e6. - - - - - 1 changed file: - mobile/android/app/000-tor-browser-android.js Changes: ===================================== mobile/android/app/000-tor-browser-android.js ===================================== @@ -35,68 +35,3 @@ pref("security.webauth.webauthn_enable_android_fido2", false); // Disable the External App Blocker on Android pref("extensions.torbutton.launch_warning", false); - -// Temporarily add the built-in bridges here. - -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); - -// Default bridges. -pref( - "extensions.torlauncher.default_bridge.obfs4.1", - "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", - "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.5", - "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.6", - "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", - "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.9", - "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.10", - "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.11", - "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" -); - -pref( - "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" -); - -pref( - "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" -); - -pref( - "extensions.torlauncher.default_bridge.snowflake.2", - "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" -); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b6d5e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b6d5e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 05 Mar '24

05 Mar '24

ma1 pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 822f5b8b by hackademix at 2024-03-05T10:46:19+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,76 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const isTrustedHome = + homeURL === "about:tor" || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/822… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/822… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 05 Mar '24

05 Mar '24

ma1 pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 01ceac8a by hackademix at 2024-03-05T10:44:20+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,76 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const isTrustedHome = + homeURL === "about:tor" || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01ceac8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01ceac8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 05 Mar '24

05 Mar '24

ma1 pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4e4718b4 by hackademix at 2024-03-05T10:26:15+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,76 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const isTrustedHome = + homeURL === "about:tor" || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e4718b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e4718b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] Bug 42378: Apply spoof English to the default detail summary.
by Pier Angelo Vendrame (＠pierov) 04 Mar '24

04 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5100fb4f by Pier Angelo Vendrame at 2024-03-04T09:49:58+01:00 Bug 42378: Apply spoof English to the default detail summary. - - - - - 1 changed file: - dom/html/HTMLDetailsElement.cpp Changes: ===================================== dom/html/HTMLDetailsElement.cpp ===================================== @@ -105,8 +105,9 @@ void HTMLDetailsElement::SetupShadowTree() { } nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetMaybeLocalizedString(nsContentUtils::eFORMS_PROPERTIES, + "DefaultSummary", OwnerDoc(), + defaultSummaryText); RefPtr<nsTextNode> description = new (nim) nsTextNode(nim); description->SetText(defaultSummaryText, kNotify); summary->AppendChildTo(description, kNotify, IgnoreErrors()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5100fb4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5100fb4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] Bug 42378: Apply spoof English to the default detail summary.
by Pier Angelo Vendrame (＠pierov) 04 Mar '24

04 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 303938d9 by Pier Angelo Vendrame at 2024-03-04T09:49:37+01:00 Bug 42378: Apply spoof English to the default detail summary. - - - - - 1 changed file: - dom/html/HTMLDetailsElement.cpp Changes: ===================================== dom/html/HTMLDetailsElement.cpp ===================================== @@ -105,8 +105,9 @@ void HTMLDetailsElement::SetupShadowTree() { } nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetMaybeLocalizedString(nsContentUtils::eFORMS_PROPERTIES, + "DefaultSummary", OwnerDoc(), + defaultSummaryText); RefPtr<nsTextNode> description = new (nim) nsTextNode(nim); description->SetText(defaultSummaryText, kNotify); summary->AppendChildTo(description, kNotify, IgnoreErrors()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/303… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/303… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 04 Mar '24

04 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 86143252 by Pier Angelo Vendrame at 2024-03-04T09:01:36+01:00 fixup! Bug 40597: Implement TorSettings module Update snowflake builtin bridges to use cdn77 domain front. Cherry-picked from tor-browser-build@0554d981793e6beb280cd8bd12e01081ca0e4c59. - - - - - 1 changed file: - toolkit/content/pt_config.json Changes: ===================================== toolkit/content/pt_config.json ===================================== @@ -1,5 +1,5 @@ { - "_comment": "Used for dev build, replaced for release builds in tor-browser-build. This file is copied from tor-browser-build cb513eec:tor-expert-bundle/pt_config.json", + "_comment": "Used for dev build, replaced for release builds in tor-browser-build. This file is copied from tor-browser-build 0554d981:projects/tor-expert-bundle/pt_config.json", "recommendedDefault" : "obfs4", "pluggableTransports" : { "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}", @@ -25,8 +25,8 @@ "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ], "snowflake" : [ - "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", - "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ] } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8614325… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8614325… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Update snowflake builtin bridges to use cdn77 domain front
by Pier Angelo Vendrame (＠pierov) 04 Mar '24

04 Mar '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 37615140 by Cecylia Bocovich at 2024-03-04T08:58:16+01:00 Update snowflake builtin bridges to use cdn77 domain front As of March 1st, foursquare.com renewed its certificate and domain fronting stopped working through this front according to fastly's new policy: https://github.com/net4people/bbs/issues/309 - - - - - 1 changed file: - projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -24,8 +24,8 @@ "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ], "snowflake" : [ - "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", - "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ] } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update snowflake builtin bridges to use cdn77 domain front
by Pier Angelo Vendrame (＠pierov) 04 Mar '24

04 Mar '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0554d981 by Cecylia Bocovich at 2024-03-01T19:33:23-05:00 Update snowflake builtin bridges to use cdn77 domain front As of March 1st, foursquare.com renewed its certificate and domain fronting stopped working through this front according to fastly's new policy: https://github.com/net4people/bbs/issues/309 - - - - - 1 changed file: - projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -24,8 +24,8 @@ "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ], "snowflake" : [ - "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", - "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ] } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- 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/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 3 commits: fixup! MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 29 Feb '24

29 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: ed66bd0f by Pier Angelo Vendrame at 2024-02-29T14:09:03+01:00 fixup! MB 38: Mullvad Browser configuration s/privacy-browser/mullvad-browser/ - - - - - b9146e90 by Pier Angelo Vendrame at 2024-02-29T14:09:08+01:00 fixup! MB 112: Updater customization for Mullvad Browser s/privacy-browser/mullvad-browser/ - - - - - e473a103 by Pier Angelo Vendrame at 2024-02-29T14:09:08+01:00 MB 234: Disable OS spoofing in HTTP User-Agent. This commits makes it possible to disable OS spoofing in the HTTP User-Agent header, to see if matching header and JS property improve usability. - - - - - 3 changed files: - browser/app/profile/000-mullvad-browser.js - netwerk/protocol/http/nsHttpHandler.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp Changes: ===================================== browser/app/profile/000-mullvad-browser.js ===================================== @@ -7,23 +7,23 @@ pref("browser.startup.homepage", "about:mullvad-browser"); // a result. pref("browser.toolbars.bookmarks.visibility", "never"); -// privacy-browser#19: Enable Mullvad's DOH +// mullvad-browser#19: Enable Mullvad's DOH pref("network.trr.uri", "https://dns.mullvad.net/dns-query"); pref("network.trr.default_provider_uri", "https://dns.mullvad.net/dns-query"); pref("network.trr.mode", 3); pref("doh-rollout.provider-list", "[{\"UIName\":\"Mullvad\",\"autoDefault\":true,\"canonicalName\":\"\",\"id\":\"mullvad\",\"last_modified\":0,\"schema\":0,\"uri\":\"https://dns.mullvad.net/dns-query\"},{\"UIName\":\"Mullvad (Ad-blocking)\",\"autoDefault\":false,\"canonicalName\":\"\",\"id\":\"mullvad\",\"last_modified\":0,\"schema\":0,\"uri\":\"https://adblock.dns.mullvad.net/dns-query\"}]"); -// privacy-browser#122: Audit DoH heuristics +// mullvad-browser#122: Audit DoH heuristics pref("doh-rollout.disable-heuristics", true); -// privacy-browser#37: Customization for the about dialog +// mullvad-browser#37: Customization for the about dialog pref("app.releaseNotesURL.aboutDialog", "about:blank"); -// privacy-browser#94: Disable legacy global microphone/webcam indicator +// mullvad-browser#94: Disable legacy global microphone/webcam indicator // Disable the legacy Firefox Quantum-styled global webcam/microphone indicator in favor of each // platform's native indicator pref("privacy.webrtc.legacyGlobalIndicator", false); -// privacy-browser#87: Windows and Linux need additional work to make the +// mullvad-browser#87: Windows and Linux need additional work to make the // default browser choice working. // We are shipping only the portable versions for the initial release anyway, so // we leave this popup enabled only on macOS. @@ -34,7 +34,7 @@ pref("browser.shell.checkDefaultBrowser", false); // mullvad-browser#228: default to spoof en-US and skip showing the dialog pref("privacy.spoof_english", 2); -// privacy-browser#131: Review a few updater preferences +// mullvad-browser#131: Review a few updater preferences pref("app.update.notifyDuringDownload", true); pref("app.update.url.manual", "https://mullvad.net/download/browser"); pref("app.update.url.details", "https://mullvad.net/download/browser"); @@ -45,3 +45,6 @@ pref("app.releaseNotesURL", "https://github.com/mullvad/mullvad-browser/releases pref("app.releaseNotesURL.aboutDialog", "about:blank"); // point to our feedback url rather than Mozilla's pref("app.feedback.baseURL", "https://mullvad.net/help/tag/browser/"); + +// mullvad-browser#234: Do not spoof the OS in the User-Agent header +pref("privacy.resistFingerprinting.spoofOsInUserAgentHeader", false); ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -497,6 +497,9 @@ nsresult nsHttpHandler::Init() { // obsService->AddObserver(this, "net:failed-to-process-uri-content", true); } + Preferences::AddWeakObserver( + this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); + MakeNewRequestTokenBucket(); mWifiTickler = new Tickler(); if (NS_FAILED(mWifiTickler->Init())) mWifiTickler = nullptr; @@ -2071,6 +2074,9 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, // Inform nsIOService that network is tearing down. gIOService->SetHttpHandlerAlreadyShutingDown(); + Preferences::RemoveObserver( + this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); + ShutdownConnectionManager(); // need to reset the session start time since cache validation may @@ -2196,6 +2202,11 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, ShutdownConnectionManager(); mConnMgr = nullptr; Unused << InitConnectionMgr(); + } else if (!strcmp(topic, "nsPref:changed") && + !NS_strcmp( + data, + u"privacy.resistFingerprinting.spoofOsInUserAgentHeader")) { + nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); } return NS_OK; ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -939,12 +939,17 @@ void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent + const bool spoofOs = + isForHTTPHeader && + Preferences::GetBool( + "privacy.resistFingerprinting.spoofOsInUserAgentHeader", true); + // These magic numbers are the lengths of the UA string literals below. // Assume three-digit Firefox version numbers so we have room to grow. size_t preallocatedLength = 13 + - (isForHTTPHeader ? mozilla::ArrayLength(SPOOFED_HTTP_UA_OS) - : mozilla::ArrayLength(SPOOFED_UA_OS)) - + (spoofOs ? mozilla::ArrayLength(SPOOFED_HTTP_UA_OS) + : mozilla::ArrayLength(SPOOFED_UA_OS)) - 1 + 5 + 3 + 10 + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + 2; userAgent.SetCapacity(preallocatedLength); @@ -954,7 +959,7 @@ void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, // "Mozilla/5.0 (%s; rv:%d.0) Gecko/%d Firefox/%d.0" userAgent.AssignLiteral("Mozilla/5.0 ("); - if (isForHTTPHeader) { + if (spoofOs) { userAgent.AppendLiteral(SPOOFED_HTTP_UA_OS); } else { userAgent.AppendLiteral(SPOOFED_UA_OS); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/3b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/3b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41098: Fix URL in tor-qa email in TB Release Prep issue templates
by richard (＠richard) 29 Feb '24

29 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5ee43d20 by Nicolas Vigier at 2024-02-29T12:46:52+00:00 Bug 41098: Fix URL in tor-qa email in TB Release Prep issue templates - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -147,7 +147,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: - - https://tb-build-02.torproject.org/~$(BUILDER)/builds/alpha/unsigned/$(TOR_… + - https://tb-build-02.torproject.org/~$(BUILDER)/builds/torbrowser/alpha/unsi… The full changelog can be found here: ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -148,7 +148,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE Unsigned Tor Browser $(TOR_BROWSER_VERSION) release candidate builds are now available for testing: - - https://tb-build-02.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… + - https://tb-build-02.torproject.org/~$(BUILDER)/builds/torbrowser/release/un… The full changelog can be found here: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41097: authenticode-timestamping.sh: create $tmp_dir with mktemp -d
by richard (＠richard) 29 Feb '24

29 Feb '24

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 02f786b2 by Nicolas Vigier at 2024-02-29T12:41:41+00:00 Bug 41097: authenticode-timestamping.sh: create $tmp_dir with mktemp -d (cherry picked from commit 800e2fff2d33150beffc086a46921807532bddcc) - - - - - 1 changed file: - tools/signing/authenticode-timestamping.sh Changes: ===================================== tools/signing/authenticode-timestamping.sh ===================================== @@ -46,8 +46,8 @@ test -f "$osslsigncode_file" || which rename > /dev/null 2>&1 || exit_error '`rename` is missing.' -tmp_dir="$signed_dir/$tbb_version/tmp-timestamp" -mkdir "$tmp_dir" +tmp_dir=$(mktemp -d) +trap "rm -Rf $tmp_dir" EXIT tar -C "$tmp_dir" -xf "$osslsigncode_file" export PATH="$PATH:$tmp_dir/osslsigncode/bin" @@ -64,5 +64,3 @@ do done echo "Timestamped $COUNT .exe files, now renaming" rename -f 's/-timestamped//' *-timestamped - -rm -Rf "$tmp_dir" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- 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-build][main] Bug 41097: authenticode-timestamping.sh: create $tmp_dir with mktemp -d
by richard (＠richard) 29 Feb '24

29 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 800e2fff by Nicolas Vigier at 2024-02-29T12:37:42+00:00 Bug 41097: authenticode-timestamping.sh: create $tmp_dir with mktemp -d - - - - - 1 changed file: - tools/signing/authenticode-timestamping.sh Changes: ===================================== tools/signing/authenticode-timestamping.sh ===================================== @@ -46,8 +46,8 @@ test -f "$osslsigncode_file" || which rename > /dev/null 2>&1 || exit_error '`rename` is missing.' -tmp_dir="$signed_dir/$tbb_version/tmp-timestamp" -mkdir "$tmp_dir" +tmp_dir=$(mktemp -d) +trap "rm -Rf $tmp_dir" EXIT tar -C "$tmp_dir" -xf "$osslsigncode_file" export PATH="$PATH:$tmp_dir/osslsigncode/bin" @@ -64,5 +64,3 @@ do done echo "Timestamped $COUNT .exe files, now renaming" rename -f 's/-timestamped//' *-timestamped - -rm -Rf "$tmp_dir" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 29 Feb '24

29 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 3b8bacb8 by Pier Angelo Vendrame at 2024-02-29T10:05:37+01:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -406,6 +406,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/3b8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/3b8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 29 Feb '24

29 Feb '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4c125e5a by Pier Angelo Vendrame at 2024-02-29T10:05:12+01:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -407,6 +407,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4c125e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4c125e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41082: Tor Expert Bundle android builds create .aar file
by Pier Angelo Vendrame (＠pierov) 28 Feb '24

28 Feb '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b5acc813 by Dan Ballard at 2024-02-28T12:59:28-08:00 Bug 41082: Tor Expert Bundle android builds create .aar file - - - - - 7 changed files: - projects/browser/build - projects/browser/build.android - projects/tor-android-service/build - + projects/tor-expert-bundle/AndroidManifest.xml - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - projects/tor-onion-proxy-library/build Changes: ===================================== projects/browser/build ===================================== @@ -90,10 +90,10 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b [% END -%] } - tar -xvf [% c('input_files_by_name/tor-expert-bundle') %] + tar -xvf [% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle.tar.gz [% IF c("var/macos_universal") -%] mkdir aarch64 - tar -C aarch64 -xf [% c('input_files_by_name/tor-expert-bundle-aarch64') %] + tar -C aarch64 -xf [% c('input_files_by_name/tor-expert-bundle-aarch64') %]/tor-expert-bundle.tar.gz [% END -%] # geoip(6) and anything else that belongs in the data dir from the expert bundle @@ -451,13 +451,13 @@ fi [%IF c("var/tor-browser") -%] tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]" # strip off trailing "$buildid.tar.gz" - tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz - cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/$tor_expert_bundle_dest + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz + cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz "$OUTDIR"/$tor_expert_bundle_dest [% IF c("var/macos_universal") %] tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle-aarch64') %]" # strip off trailing "$buildid.tar.gz" - tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz - cp $rootdir/[% c('input_files_by_name/tor-expert-bundle-aarch64') %] "$OUTDIR"/$tor_expert_bundle_dest + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz + cp $rootdir/[% c('input_files_by_name/tor-expert-bundle-aarch64') %]/tor-expert-bundle.tar.gz "$OUTDIR"/$tor_expert_bundle_dest [% END -%] [% END -%] [% IF c("var/build_infos_json") -%] ===================================== projects/browser/build.android ===================================== @@ -24,7 +24,7 @@ cd /var/tmp/build mv $rootdir/[% c('input_files_by_name/noscript') %] "$noscript_path" [%IF c("var/tor-browser") -%] - tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]" tor/pluggable_transports/pt_config.json + tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json [% END -%] unzip -j "$apk" assets/omni.ja mkdir omni @@ -70,8 +70,8 @@ unsign_patch="[% dest_dir %]/[% c('filename') %]/[% c('var/project-name') %]-qa- bsdiff $qa_apk $aligned_apk $unsign_patch [%IF c("var/tor-browser") -%] - tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]" + tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle') %]" # strip off trailing "$buildid.tar.gz" - tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz - cp $rootdir/$tor_expert_bundle_src [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz + cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest [% END -%] ===================================== projects/tor-android-service/build ===================================== @@ -35,7 +35,7 @@ rm -fR service/src/main/jniLibs/* # Extract tor-expert-bundle tebdir=$rootdir/tor-expert-bundle-[% arch %] mkdir $tebdir - tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %] + tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle.tar.gz # Figure out our android abi from our arch [% IF arch == "armv7" -%] ===================================== projects/tor-expert-bundle/AndroidManifest.xml ===================================== @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.torproject.torExpertBundle" + android:versionCode="1" + android:versionName="0.0.1" > + + <uses-sdk + android:minSdkVersion="16" + android:targetSdkVersion="29" /> + + <uses-permission android:name="android.permission.INTERNET" /> + + <application android:allowBackup="false" > + </application> + +</manifest> \ No newline at end of file ===================================== projects/tor-expert-bundle/build ===================================== @@ -2,6 +2,10 @@ [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir + +output_dir=[% dest_dir %]/[% c('filename') %] +mkdir -p $output_dir + cd $distdir tar -xkf $rootdir/[% c('input_files_by_name/tor') %] @@ -18,6 +22,32 @@ tar -xkf $rootdir/[% c('input_files_by_name/conjure') %] awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json cd $distdir + +# package a .aar on android +[% IF c("var/android") -%] + aar_file=torExpertBundle-[% c('arch') %].aar + + mkdir aar + mkdir -p aar/jni/[% c('arch') %] + mkdir -p aar/assets/common + + cp -a tor/libTor.so aar/jni/[% c('arch') %]/ + cp -a tor/pluggable_transports/conjure-client aar/jni/[% c('arch') %]/libConjure.so + cp -a tor/pluggable_transports/lyrebird aar/jni/[% c('arch') %]/Lyrebird.so + cp -a tor/pluggable_transports/snowflake-client aar/jni/[% c('arch') %]/libSnowflake.so + cp -a tor/pluggable_transports/webtunnel-client aar/jni/[% c('arch') %]/libWebtunnel.so + + cp -a data/* aar/assets/common/ + + cp -a tor/pluggable_transports/pt_config.json aar/assets/common/ + + cp -a $rootdir/AndroidManifest.xml aar/ + + cd aar + jar -cvf $output_dir/tor-expert-bundle-[% c('arch') %].aar * + cd .. +[% END %] + [% SET tar_src = [ "tor", "data" ]; IF c("var/linux"); @@ -25,6 +55,6 @@ cd $distdir END; c('tar', { tar_src => tar_src, - tar_args => '-czvf' _ dest_dir _ '/' _ c('filename'), + tar_args => '-czvf' _ dest_dir _ '/' _ c('filename') _ '/tor-expert-bundle.tar.gz', }); -%] +%] \ No newline at end of file ===================================== projects/tor-expert-bundle/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' version: '[% c("var/torbrowser_version") %]' container: @@ -23,3 +23,4 @@ input_files: - name: conjure project: conjure - filename: pt_config.json + - filename: AndroidManifest.xml ===================================== projects/tor-onion-proxy-library/build ===================================== @@ -43,7 +43,7 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch # Extract tor-expert-bundle tebdir=$rootdir/tor-expert-bundle-[% arch %] mkdir $tebdir - tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %] + tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle.tar.gz ptdir=$tebdir/tor/pluggable_transports # Overwrite the obfs4proxy binary provided by Pluto and add Snowflake View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… 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.5a5
by boklm (＠boklm) 28 Feb '24

28 Feb '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: db64cd7d by Nicolas Vigier at 2024-02-28T17:02:15+01:00 alpha: new version, 13.5a5 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.5a1-13.5a4-linux-i686-ALL.xml - − update_3/alpha/13.5a1-13.5a4-linux-x86_64-ALL.xml - − update_3/alpha/13.5a1-13.5a4-macos-ALL.xml - − update_3/alpha/13.5a1-13.5a4-windows-i686-ALL.xml - − update_3/alpha/13.5a1-13.5a4-windows-x86_64-ALL.xml - − update_3/alpha/13.5a2-13.5a4-linux-i686-ALL.xml - − update_3/alpha/13.5a2-13.5a4-linux-x86_64-ALL.xml - − update_3/alpha/13.5a2-13.5a4-macos-ALL.xml - − update_3/alpha/13.5a2-13.5a4-windows-i686-ALL.xml - − update_3/alpha/13.5a2-13.5a4-windows-x86_64-ALL.xml - + update_3/alpha/13.5a2-13.5a5-linux-i686-ALL.xml - + update_3/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml - + update_3/alpha/13.5a2-13.5a5-macos-ALL.xml - + update_3/alpha/13.5a2-13.5a5-windows-i686-ALL.xml - + update_3/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml - − update_3/alpha/13.5a3-13.5a4-linux-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a4-linux-x86_64-ALL.xml - − update_3/alpha/13.5a3-13.5a4-macos-ALL.xml - − update_3/alpha/13.5a3-13.5a4-windows-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a4-windows-x86_64-ALL.xml - + update_3/alpha/13.5a3-13.5a5-linux-i686-ALL.xml - + update_3/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml - + update_3/alpha/13.5a3-13.5a5-macos-ALL.xml - + update_3/alpha/13.5a3-13.5a5-windows-i686-ALL.xml - + update_3/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a5-linux-i686-ALL.xml - + update_3/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a5-macos-ALL.xml - + update_3/alpha/13.5a4-13.5a5-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… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 28 Feb '24

28 Feb '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5bb3b747 by Pier Angelo Vendrame at 2024-02-28T11:26:08+01:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -407,6 +407,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5bb3b74… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5bb3b74… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41093: Unsign APKs before signing them
by boklm (＠boklm) 28 Feb '24

28 Feb '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7c9183b0 by Nicolas Vigier at 2024-02-28T16:17:42+01:00 Bug 41093: Unsign APKs before signing them Use the bspatch file we create during the build to unsign the apk (which was signed by the QA key) before signing it with the release key. - - - - - 2 changed files: - tools/signing/linux-signer-sign-android-apks - tools/signing/machines-setup/setup-signing-machine Changes: ===================================== tools/signing/linux-signer-sign-android-apks ===================================== @@ -68,14 +68,19 @@ setup_build_tools mkdir -p ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" chgrp signing ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" chmod g+w ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" -cp -af ~/"$SIGNING_PROJECTNAME-$tbb_version"/*.apk ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" +cp -af ~/"$SIGNING_PROJECTNAME-$tbb_version"/*.apk \ + ~/"$SIGNING_PROJECTNAME-$tbb_version"/*.bspatch \ + ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" cd ~/"$SIGNING_PROJECTNAME-$tbb_version-apks" # Sign all packages for arch in ${ARCHS}; do qa_apk=${projname}-qa-android-${arch}-${tbb_version}.apk + unsigned_apk=${projname}-qa-unsigned-android-${arch}-${tbb_version}.apk + unsigned_apk_bspatch=${projname}-qa-unsign-android-${arch}-${tbb_version}.bspatch signed_apk=${projname}-android-${arch}-${tbb_version}.apk - sign_apk "$qa_apk" "$signed_apk" + bspatch "$qa_apk" "$unsigned_apk" "$unsigned_apk_bspatch" + sign_apk "$unsigned_apk" "$signed_apk" verify_apk "$signed_apk" cp -f "$signed_apk" ~/"$SIGNING_PROJECTNAME-$tbb_version" done ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -116,7 +116,7 @@ install_packages opensc libengine-pkcs11-openssl install_packages cmake libusb-1.0-0-dev libedit-dev gengetopt libpcsclite-dev help2man chrpath dh-exec # Install deps for android/apk signing -install_packages unzip openjdk-11-jdk-headless openjdk-11-jre-headless +install_packages unzip openjdk-11-jdk-headless openjdk-11-jre-headless bsdiff # Install deps for macos-rcodesign signing install_packages p7zip-full zstd View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… 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.5a5-build2
by Pier Angelo Vendrame (＠pierov) 27 Feb '24

27 Feb '24

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41075: Prepare Tor Browser 13.5a5 (build2).
by Pier Angelo Vendrame (＠pierov) 27 Feb '24

27 Feb '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b1728edd by Pier Angelo Vendrame at 2024-02-27T12:28:41+01:00 Bug 41075: Prepare Tor Browser 13.5a5 (build2). This build fixes a crash on Android and has a couple of other Android improvements. - - - - - 3 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox-android/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,4 +1,4 @@ -Tor Browser 13.5a5 - February 27 2024 +Tor Browser 13.5a5 - February 28 2024 * All Platforms * Updated OpenSSL to 3.0.13 * Updated Snowflake to 2.9.0 @@ -43,6 +43,8 @@ Tor Browser 13.5a5 - February 27 2024 * Android * Bug 42399: Re-enable minimization of JS for Android [tor-browser] * Bug 41080: Re-pack omni.ja with 7-zip on Android [tor-browser-build] + * Bug 41092: Use an uncompressed omni.ja to improve final apk compression. [tor-browser-build] + * Bug 41093: Sign unsigned APKs instead of the QA-signed ones [tor-browser-build] Tor Browser 13.0.10 - February 20 2024 * All Platforms ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 6 + browser_build: 7 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '13.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - '13.5a4' - '13.5a3' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41093: Add a patch to unsign APKs.
by Pier Angelo Vendrame (＠pierov) 27 Feb '24

27 Feb '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ede46581 by Pier Angelo Vendrame at 2024-02-27T12:27:17+01:00 Bug 41093: Add a patch to unsign APKs. Currently, we sign the APKs that were already signed with the QA key. However, this makes it impossible to copy our signature on top of APKs built independently, which would be the last step to reproduce our builds. With this commit, we provide a patch to go back to the unsigned (but already aligned) APK, so that we can keep shipping QA-signed APKs for testers, but we can go back to the unsigned APK for the final signing. The changes to apply this patch in the signing scripts will be part of another commit. - - - - - 4 changed files: - README - projects/browser/build.android - projects/browser/config - projects/release/build Changes: ===================================== README ===================================== @@ -54,7 +54,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with: "perl(Template)" "perl(IO::Handle)" "perl(Capture::Tiny)" \ "perl(JSON)" "perl(File::Temp)" "perl(Path::Tiny)" \ "perl(File::Path)" "perl(File::Slurp)" \ - "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" + "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \ "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \ "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \ "perl(Parallel::ForkManager)" perl-ph mercurial git zstd @@ -237,11 +237,12 @@ builds, and will require that you run Debian Bullseye or Bookworm and install build dependencies for all the components that are built. This can be done with the following command: - # apt-get install build-essential python3 automake libtool zip unzip \ - autoconf2.13 openjdk-11-jdk gettext-base autotools-dev \ - automake autoconf libtool autopoint libssl-dev pkg-config \ - zlib1g-dev libparallel-forkmanager-perl libfile-slurp-perl bzip2 \ - xz-utils apksigner yasm wget bison gyp tcl python3-venv 7zip jq + # apt-get install 7zip apksigner autoconf autoconf2.13 automake autopoint \ + autotools-dev bison bsdiff build-essential bzip2 \ + gettext-base gyp jq libfile-slurp-perl \ + libparallel-forkmanager-perl libssl-dev libtool libtool \ + openjdk-11-jdk pkg-config python3 python3-venv tcl unzip \ + wget xz-utils yasm zip zlib1g-dev Note that Debian Bullseye requires the bullseye-backports repository to get the 7zip package. ===================================== projects/browser/build.android ===================================== @@ -66,6 +66,9 @@ zipalign -vp 4 repacked.apk $aligned_apk # flag in the manifest. apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +unsign_patch="[% dest_dir %]/[% c('filename') %]/[% c('var/project-name') %]-qa-unsign-[% c('var/osname') %]-[% c('version') %].bspatch" +bsdiff $qa_apk $aligned_apk $unsign_patch + [%IF c("var/tor-browser") -%] tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]" # strip off trailing "$buildid.tar.gz" ===================================== projects/browser/config ===================================== @@ -48,6 +48,7 @@ targets: arch_deps: - 7zip - openjdk-17-jdk-headless + - bsdiff container: # 7zip is in backports in bullseye, and we can already use Java 17 for # apksigner. ===================================== projects/release/build ===================================== @@ -59,7 +59,7 @@ EOF # empty any existing sh256sums file echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set -for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort) +for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.bspatch *.json | grep -v '\.incremental\.mar$' | sort) do sha256sum $i >> sha256sums-unsigned-build.txt done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… 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-build7
by Pier Angelo Vendrame (＠pierov) 27 Feb '24

27 Feb '24

Pier Angelo Vendrame pushed new tag firefox-android-115.2.1-13.5-1-build7 at The Tor Project / Applications / firefox-android -- 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/rbm][main] Bug 40073: Remove the ./ prefix when zipping files.
by Pier Angelo Vendrame (＠pierov) 27 Feb '24

27 Feb '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / RBM Commits: 060cdc8e by Pier Angelo Vendrame at 2024-02-27T10:23:33+01:00 Bug 40073: Remove the ./ prefix when zipping files. When using 7-zip, the ./ prefix is added to the archive, and it breaks some consumers (e.g., Firefox when re-packing omni.ja). - - - - - 1 changed file: - lib/RBM/DefaultConfig.pm Changes: ===================================== lib/RBM/DefaultConfig.pm ===================================== @@ -607,7 +607,7 @@ TAR_END find [% src.join(' ') %] -exec touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] -- {} + find [% src.join(' ') %] [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 700 {} \\; find [% src.join(' ') %] ! [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 600 {} \\; -find [% src.join(' ') %] | sort | \ +find [% src.join(' ') %][% IF c("use_7z") -%] -printf '%P\\n'[% END %] | sort | \ [% IF c("use_7z") -%] cat > "\$tmp7z" [% c('7z_bin') %] a -tzip -spf [% c('7z_opts') %] [% c('zip_args', { error_if_undef => 1 }) %] "@\$tmp7z" View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/060cdc8e82a1d31… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/060cdc8e82a1d31… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41092: Use an uncompressed omni.ja to improve final apk compression.
by ma1 (＠ma1) 27 Feb '24

27 Feb '24

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5333cc52 by Giorgio Maone at 2024-02-26T20:26:46+00:00 Bug 41092: Use an uncompressed omni.ja to improve final apk compression. - - - - - 1 changed file: - projects/browser/build.android Changes: ===================================== projects/browser/build.android ===================================== @@ -35,10 +35,7 @@ unzip ../omni.ja [% END -%] [% c('zip', { zip_src => [ '.' ], - zip_args => '../assets/omni.ja', - use_7z => 1, - '7z_bin' => '7zz', - '7z_opts' => '-mx9', + zip_args => '-0 ../assets/omni.ja', }) %] popd View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40569: Update remaining macOS signing scripts to include channel name
by richard (＠richard) 26 Feb '24

26 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8a492802 by Richard Pospesel at 2024-02-26T15:45:39+00:00 Bug 40569: Update remaining macOS signing scripts to include channel name - - - - - 6 changed files: - projects/release/dmg2mar - tools/signing/functions - tools/signing/linux-signer-rcodesign-sign - tools/signing/rcodesign-notary-submit - tools/signing/set-config - tools/signing/wrappers/sign-rcodesign Changes: ===================================== projects/release/dmg2mar ===================================== @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] -export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]' +export TOR_APPNAME_BUNDLE_OSX='[% c("var/display_name") -%]' export TOR_APPNAME_DMGFILE='[% c("var/project-name") -%]' export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]' [% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/mar_channel_id") %] ===================================== tools/signing/functions ===================================== @@ -39,7 +39,7 @@ function generate_config { p1=$("$rbm" showconf browser var/project-name --target "$SIGNING_PROJECTNAME") p2=$("$rbm" showconf browser var/Project_Name --target "$SIGNING_PROJECTNAME") p3=$("$rbm" showconf browser var/ProjectName --target "$SIGNING_PROJECTNAME") - p4=$("$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME") + p4=$("$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME" --target "$tbb_version_type") echo 'rbm_not_available=1' > "$script_dir/set-config.generated-config" echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" >> "$script_dir/set-config.generated-config" } @@ -72,7 +72,7 @@ function display_name { if test -n "${rbm_not_available+x}"; then echo "${SIGNING_PROJECTNAMES[3]}" else - "$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME" + "$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME" --target "$tbb_version_type" fi } ===================================== tools/signing/linux-signer-rcodesign-sign ===================================== @@ -13,11 +13,11 @@ if [ -z "$RCODESIGN_PW" ]; then export RCODESIGN_PW fi -Proj_Name=$(Project_Name) +display_name=$(display_name) output_file=$(project-name)-macos-${tbb_version}-rcodesign-signed.tar.zst destdir=~/"$SIGNING_PROJECTNAME-$tbb_version-macos-signed" mkdir -p $destdir rm -f "$destdir/$output_file" -sudo -u signing-macos -- /signing/tor-browser-build/tools/signing/wrappers/sign-rcodesign ~/"$SIGNING_PROJECTNAME-$tbb_version"/$(project-name)-macos-${tbb_version}.dmg "$Proj_Name" -cp "/home/signing-macos/last-signed-$Proj_Name.tar.zst" "$destdir/$output_file" +sudo -u signing-macos -- /signing/tor-browser-build/tools/signing/wrappers/sign-rcodesign ~/"$SIGNING_PROJECTNAME-$tbb_version"/$(project-name)-macos-${tbb_version}.dmg "$display_name" +cp "/home/signing-macos/last-signed-$display_name.tar.zst" "$destdir/$output_file" ===================================== tools/signing/rcodesign-notary-submit ===================================== @@ -17,14 +17,14 @@ test -f "$appstoreconnect_api_key_path" || \ tmpdir=$(mktemp -d -p /var/tmp) trap "rm -Rf $tmpdir" EXIT -Proj_Name=$(Project_Name) +display_name=$(display_name) tar -C "$tmpdir" -xf "$macos_rcodesign_signed_tar_dir/$(project-name)-macos-${tbb_version}-rcodesign-signed.tar.zst" -"$script_dir/../local/rcodesign/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$Proj_Name.app" +"$script_dir/../local/rcodesign/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app" output_file="$(project-name)-${tbb_version}-notarized+stapled.tar.zst" -tar -C "$tmpdir" -caf "$tmpdir/$output_file" "$Proj_Name.app" +tar -C "$tmpdir" -caf "$tmpdir/$output_file" "$display_name.app" mkdir -p "$macos_stapled_dir" mv "$tmpdir/$output_file" "$macos_stapled_dir/$output_file" ===================================== tools/signing/set-config ===================================== @@ -23,6 +23,12 @@ export SIGNING_PROJECTNAME test -z "${rbm_not_available+x}" && rbm="$script_dir/../../rbm/rbm" . "$script_dir/set-config.tbb-version" + +test "$tbb_version_type" = 'release' \ + || test "$tbb_version_type" = 'alpha' \ + || test "$tbb_version_type" = 'nightly' \ + || exit_error "Unknown tbb_version_type $tbb_version_type" + . "$script_dir/set-config.hosts" signed_dir="$script_dir/../../$SIGNING_PROJECTNAME/$tbb_version_type/signed" ===================================== tools/signing/wrappers/sign-rcodesign ===================================== @@ -11,9 +11,9 @@ function exit_error { test $# -eq 2 || exit_error "Wrong number of arguments" dmg_file="$1" -Proj_Name="$2" +display_name="$2" -output_file="/home/signing-macos/last-signed-$Proj_Name.tar.zst" +output_file="/home/signing-macos/last-signed-$display_name.tar.zst" rm -f "$output_file" rcodesign_signing_p12_file=/home/signing-macos/keys/key-1.p12 @@ -28,11 +28,11 @@ cd "$tmpdir" # https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/2… # FIXME: Maybe we should extract the .mar file instead of the .dmg to # preserve permissions -chmod ugo+x "$Proj_Name/$Proj_Name.app/Contents/MacOS"/* \ - "$Proj_Name/$Proj_Name.app/Contents/MacOS/updater.app/Contents/MacOS"/* \ - "$Proj_Name/$Proj_Name.app/Contents/MacOS/plugin-container.app/Contents/MacOS"/* -test -d "$Proj_Name/$Proj_Name.app/Contents/MacOS/Tor" && \ - chmod -R ugo+x "$Proj_Name/$Proj_Name.app/Contents/MacOS/Tor" +chmod ugo+x "$display_name/$display_name.app/Contents/MacOS"/* \ + "$display_name/$display_name.app/Contents/MacOS/updater.app/Contents/MacOS"/* \ + "$display_name/$display_name.app/Contents/MacOS/plugin-container.app/Contents/MacOS"/* +test -d "$display_name/$display_name.app/Contents/MacOS/Tor" && \ + chmod -R ugo+x "$display_name/$display_name.app/Contents/MacOS/Tor" pwdir=/run/lock/rcodesign-pw trap "rm -Rf $pwdir" EXIT @@ -56,19 +56,19 @@ rcodesign_opts=" echo '**** Signing updater.app ****' /signing/rcodesign/rcodesign sign \ $rcodesign_opts \ - --info-plist-path "$Proj_Name/$Proj_Name.app/Contents/MacOS/updater.app/Contents/Info.plist" \ + --info-plist-path "$display_name/$display_name.app/Contents/MacOS/updater.app/Contents/Info.plist" \ -- \ - "$Proj_Name/$Proj_Name.app/Contents/MacOS/updater.app" + "$display_name/$display_name.app/Contents/MacOS/updater.app" echo '**** Signing plugin-container.app ****' /signing/rcodesign/rcodesign sign \ $rcodesign_opts \ --entitlements-xml-path /signing/tor-browser-build/tools/signing/${tbb_version_type}.entitlements.xml \ -- \ - "$Proj_Name/$Proj_Name.app/Contents/MacOS/plugin-container.app" + "$display_name/$display_name.app/Contents/MacOS/plugin-container.app" # Setting binary-identifier on some files, to avoid signature errors. See: # https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/2… -pushd "$Proj_Name/$Proj_Name.app/Contents/MacOS/" +pushd "$display_name/$display_name.app/Contents/MacOS/" for lib in *.dylib do binident=$(echo $lib | sed 's/\.dylib$//') @@ -78,9 +78,9 @@ do done popd -if test -d "$Proj_Name/$Proj_Name.app/Contents/MacOS/Tor/PluggableTransports/" +if test -d "$display_name/$display_name.app/Contents/MacOS/Tor/PluggableTransports/" then - pushd "$Proj_Name/$Proj_Name.app/Contents/MacOS/Tor/PluggableTransports/" + pushd "$display_name/$display_name.app/Contents/MacOS/Tor/PluggableTransports/" for file in echo * do binident="--binary-identifier Contents/MacOS/Tor/PluggableTransports/$file:$file" @@ -90,17 +90,17 @@ then popd fi -echo "**** Signing main bundle ($Proj_Name.app) ****" +echo "**** Signing main bundle ($display_name.app) ****" # We use `--exclude '**'` to avoid re-signing nested bundles /signing/rcodesign/rcodesign sign \ $rcodesign_opts \ --entitlements-xml-path /signing/tor-browser-build/tools/signing/${tbb_version_type}.entitlements.xml \ --exclude '**' \ -- \ - "$Proj_Name/$Proj_Name.app" + "$display_name/$display_name.app" rm -f "$pwdir/rcodesign-pw" rmdir "$pwdir" -tar -C "$Proj_Name" -caf "$output_file" "$Proj_Name.app" +tar -C "$display_name" -caf "$output_file" "$display_name.app" cd - rm -Rf "$tmpdir" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] Remove modem sound references
by boklm (＠boklm) 26 Feb '24

26 Feb '24

boklm pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 60d9c396 by Thomas Ward at 2024-02-26T18:18:57+01:00 Remove modem sound references - - - - - 9 changed files: - README.md - po/cs.po - po/fr.po - po/hu.po - po/nl.po - po/pt_BR.po - po/ru.po - po/sv.po - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml Changes: ===================================== README.md ===================================== @@ -8,7 +8,6 @@ Tor Browser Launcher is intended to make Tor Browser easier to install and use f * Verifies Tor Browser's [signature](https://support.torproject.org/tbb/how-to-verify-signature/) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with * Adds "Tor Browser" and "Tor Browser Launcher Settings" application launcher to your desktop environment's menu * Includes AppArmor profiles to make a Tor Browser compromise not as bad -* Optionally plays a modem sound when you open Tor Browser (because Tor is so slow) Tor Browser Launcher is included in Ubuntu, Debian, and Fedora. To install it in any other distribution, see the [build instructions](/BUILD.md). ===================================== po/cs.po ===================================== @@ -283,10 +283,6 @@ msgstr "Uložit a ukončit" #~ "Možná je na vás veden útok, anebo může jít pouze o síťovou závadu. Pro " #~ "nové stažení klikněte na Spustit." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "Chybí balíček python-pygame, zvuk modemu není dostupný." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "" @@ -295,8 +291,5 @@ msgstr "Uložit a ukončit" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Tato možnost vyžaduje balíček python-txsocksx." -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Přehrávat zvuk modemu, jelikož je Tor pomalý :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Tato možnost vyžaduje nainstalovaný python-pygame" ===================================== po/fr.po ===================================== @@ -288,11 +288,6 @@ msgstr "Enregistrer et quitter" #~ "Vous pourriez être l'objet d'une attaque, ou il peut s'agir d'un problème " #~ "de réseau. Cliquer sur Démarrer pour télécharger à nouveau." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "" -#~ "Le paquet python-pygame est manquant, le son de modem est indisponible." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "" @@ -302,8 +297,5 @@ msgstr "Enregistrer et quitter" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Cette option nécessite le paquet python-txsocksx" -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Jouer un son de modem, car Tor est lent :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Cette option requiert le paquet python-pygame" ===================================== po/hu.po ===================================== @@ -281,10 +281,6 @@ msgstr "Mentés és kilépés" #~ "Lehet, hogy támadás alatt vagy, vagy előfordulhat egy hálózati probléma " #~ "is. Kattints az indításra az újbóli letöltéshez." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "A python-pygame csomag nem található, a modem hang nem elérhető." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "" @@ -294,8 +290,5 @@ msgstr "Mentés és kilépés" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Ehhez az opcióhoz szükséges a python-txsocksx csomag" -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Modem hang lejátszása, mert a Tor lassú :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Ehhez az opcióhoz szükséges hogy a python-pygame telepítve legyen" ===================================== po/nl.po ===================================== @@ -268,8 +268,5 @@ msgstr "Opslaan & afsluiten" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Voor deze optie is het python-txsocksx pakket nodig." -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Speel modem geluid, omdat Tor langzaam is :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Voor deze optie moet python-pygame geïnstalleerd zijn" ===================================== po/pt_BR.po ===================================== @@ -288,11 +288,6 @@ msgstr "Salvar && Sair" #~ "Você pode estar sob ataque, ou pode haver apenas um problema de rede. " #~ "Clique em Iniciar para tentar baixar novamente." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "" -#~ "O pacote python-pygame está faltando, o som do modem não está disponível." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "" @@ -301,8 +296,5 @@ msgstr "Salvar && Sair" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Esta opção precisa do pacote python-txsocksx" -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Reproduzir som do modem, porque o Tor é lento :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Esta opção precisa do pacote python-pygame" ===================================== po/ru.po ===================================== @@ -285,10 +285,6 @@ msgstr "Сохранить и выйти" #~ "Вы можете бы быть под атакой, или имеют место проблемы с сетью. Нажмите " #~ "кнопку Пуск и попробуйте снова." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "Пакет python-pygame не найден, звуки модема недоступны." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "Эта опция доступна только при установки Tor в систему." @@ -296,8 +292,5 @@ msgstr "Сохранить и выйти" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Эта опция требует пакет python-txsocksx." -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Играть звуки модема, если Tor слишком медленный :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Эта опция требует установленный python-pygame" ===================================== po/sv.po ===================================== @@ -285,11 +285,6 @@ msgstr "Spara && avsluta" #~ "Du kan vara under attack, eller det kan bara vara ett nätverksproblem. " #~ "Klicka på Start för försöka hämta igen." -#~ msgid "" -#~ "The python-pygame package is missing, the modem sound is unavailable." -#~ msgstr "" -#~ "Python-pygame-paketet saknas, modemljudet är otillgängligt." - #~ msgid "" #~ "This option is only available when using a system wide Tor installation." #~ msgstr "" @@ -299,8 +294,5 @@ msgstr "Spara && avsluta" #~ msgid "This option requires the python-txsocksx package." #~ msgstr "Det här alternativet kräver python-txsocksx-paketet." -#~ msgid "Play modem sound, because Tor is slow :]" -#~ msgstr "Spela modemljud, eftersom Tor är långsamt :]" - #~ msgid "This option requires python-pygame to be installed" #~ msgstr "Det här alternativet kräver att python-pygame installeras" ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -19,7 +19,6 @@ <li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li> <li>Adding a Tor Browser application launcher to your desktop environment's menu</li> <li>Lets you set Tor Browser as your default browser</li> - <li>Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)</li> </ul> </description> <screenshots> View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] alpha: new version, 13.5a5
by richard (＠richard) 26 Feb '24

26 Feb '24

richard pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 9f6296f8 by Richard Pospesel at 2024-02-26T16:00:40+00:00 alpha: new version, 13.5a5 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/13.5a1-13.5a4-linux-x86_64-ALL.xml - − update_1/alpha/13.5a1-13.5a4-macos-ALL.xml - − update_1/alpha/13.5a1-13.5a4-windows-x86_64-ALL.xml - − update_1/alpha/13.5a2-13.5a4-linux-x86_64-ALL.xml - − update_1/alpha/13.5a2-13.5a4-macos-ALL.xml - − update_1/alpha/13.5a2-13.5a4-windows-x86_64-ALL.xml - + update_1/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml - + update_1/alpha/13.5a2-13.5a5-macos-ALL.xml - + update_1/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml - − update_1/alpha/13.5a3-13.5a4-linux-x86_64-ALL.xml - − update_1/alpha/13.5a3-13.5a4-macos-ALL.xml - − update_1/alpha/13.5a3-13.5a4-windows-x86_64-ALL.xml - + update_1/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml - + update_1/alpha/13.5a3-13.5a5-macos-ALL.xml - + update_1/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a5-macos-ALL.xml - + update_1/alpha/13.5a4-13.5a5-windows-x86_64-ALL.xml - − update_1/alpha/13.5a4-linux-x86_64-ALL.xml - − update_1/alpha/13.5a4-macos-ALL.xml - − update_1/alpha/13.5a4-windows-x86_64-ALL.xml - + update_1/alpha/13.5a5-linux-x86_64-ALL.xml - + update_1/alpha/13.5a5-macos-ALL.xml - + update_1/alpha/13.5a5-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.5a4/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a1/ALL 13.5a1-13.5a4-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a4-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a4-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a4-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5a4-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a1/ALL 13.5a1-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a1/ALL 13.5a1-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a2/ALL 13.5a2-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a3/ALL 13.5a3-13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a4-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5a4-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a1/ALL 13.5a1-13.5a4-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a2/ALL 13.5a2-13.5a4-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a3/ALL 13.5a3-13.5a4-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a4-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a4-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5a5/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a5-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a5-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a5-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a5-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5a5-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a2/ALL 13.5a2-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a3/ALL 13.5a3-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a5-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5a5-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a2/ALL 13.5a2-13.5a5-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a3/ALL 13.5a3-13.5a5-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a5-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a5-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a5-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/13.5a1-13.5a4-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4_…" hashFunction="SHA512" hashValue="f4807be1248046f3115f381dbead91fdf8731f3f3ffc76a7eb7bf32eb58f37e3e4cd76861bf6783c53662de6dfd8e3f5e2e193ae49c2828ca8c70eaad512ae9c" size="107916327" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64--13.5a1…" hashFunction="SHA512" hashValue="7929965bcf3f97ffe3a856248271d3dcbb5999b228858b75f3e1d993bfcfe5d06efecce70f1325edd1fde4edabd0d556b44e6ee56149a0f73e54c55bd773b34a" size="15875405" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a1-13.5a4-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4_ALL.mar" hashFunction="SHA512" hashValue="05aa6ee66d4dea52c6fec07d45cb0bc96dc813b3f86db418eb86ecf6dccd44e85c0fb1c7c2450d50b35b1ad8da0a7d16ed16f2083fef7e3e1135774ad278908b" size="115308515" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos--13.5a1-13.5a4…" hashFunction="SHA512" hashValue="e49a99198e0046cc0133a69991bc204ec89e4fe07216be40d7a669ecd3b8ac26c889de3a0d161b6be726105369e46d2e92c84177cdde14df968005a5aafe1b1f" size="17266465" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a1-13.5a4-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="2681c3052302fa2e791e6c82d2ad48569d8f1622400bd433efe31e7757e8002c0f5c1f2930949f89ee059bc61b2cea2101d56b67f2c506eb6222a0ff709948f6" size="89263680" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="69038008b474bf188b13e1c41331de90f0b591f93f961145b744d9df552a423b5e1c17ad36db608e53a68c31249e9c9f31ddba6b7ab066b91ea44aa0c2b17640" size="12871701" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a4-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4_…" hashFunction="SHA512" hashValue="f4807be1248046f3115f381dbead91fdf8731f3f3ffc76a7eb7bf32eb58f37e3e4cd76861bf6783c53662de6dfd8e3f5e2e193ae49c2828ca8c70eaad512ae9c" size="107916327" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64--13.5a2…" hashFunction="SHA512" hashValue="615a7a213ae930ab0072f3e4f0eb6ff823e371fb2931e6ea50ab82b47a30acbdc2904e790bd186886da8540e2dc89fa5f8383938acb9de3a81a7552f53527577" size="14878410" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a4-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4_ALL.mar" hashFunction="SHA512" hashValue="05aa6ee66d4dea52c6fec07d45cb0bc96dc813b3f86db418eb86ecf6dccd44e85c0fb1c7c2450d50b35b1ad8da0a7d16ed16f2083fef7e3e1135774ad278908b" size="115308515" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos--13.5a2-13.5a4…" hashFunction="SHA512" hashValue="dcabe3438794aae6e64d72bfe836ad65cf8454e6db2aef9acaaa07d83d341912a5bf9ccf1b3125ff0cc00846fe6b79b0d775e0d47c3bf1f5777a97356a7148c7" size="16017493" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a4-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="2681c3052302fa2e791e6c82d2ad48569d8f1622400bd433efe31e7757e8002c0f5c1f2930949f89ee059bc61b2cea2101d56b67f2c506eb6222a0ff709948f6" size="89263680" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="ffe9a835049d044d17e66bcb06c035f145c7cd6913de0f23755fda6a164406bc86fa9dc5297a9fec7eac1b23014f742e9733bd4ddf7cd89a7a979525b2570657" size="11825429" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a2…" hashFunction="SHA512" hashValue="1bccb4e6d90149c717ab67c69b14a7fc700d895234fada19e3e1c931fbdf20547e9328d3811fa2e2086870066942c7db9da9de2b03cf1a13ae783cc95604fe54" size="16054601" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a5-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a2-13.5a5…" hashFunction="SHA512" hashValue="96de560f4b1c1365b04337ffceda5fa2343a37f50871fe96ae5060d323f78bcc328a53c220ca7d1d181486c6ebd9fc3096d0b473e85c03539b5dfa70d8ec1507" size="17554527" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="478f55fa20621b1a0791a71e4014d74c444725574b1ad9bf273027ff5ed0b06464560b110c06f3c587bd30af8a30854ccb81a3803441b8a992bddc7346ccfb51" size="13159675" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a4-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4_…" hashFunction="SHA512" hashValue="f4807be1248046f3115f381dbead91fdf8731f3f3ffc76a7eb7bf32eb58f37e3e4cd76861bf6783c53662de6dfd8e3f5e2e193ae49c2828ca8c70eaad512ae9c" size="107916327" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64--13.5a3…" hashFunction="SHA512" hashValue="5d8408d9e6e701a3ba9ff4e697b55f23d86e6909aa406b23730772631893cb5b6ca8f472fa5a2ffa448bcbf055375afc0775ad82d583ee45a1a1d64e8a3db761" size="13991539" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a4-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4_ALL.mar" hashFunction="SHA512" hashValue="05aa6ee66d4dea52c6fec07d45cb0bc96dc813b3f86db418eb86ecf6dccd44e85c0fb1c7c2450d50b35b1ad8da0a7d16ed16f2083fef7e3e1135774ad278908b" size="115308515" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos--13.5a3-13.5a4…" hashFunction="SHA512" hashValue="bf3ef67f38db8d9bb85f07dc92c2ee3e70e767c1954c07e9538c1bb6a84a1c98ca1ce280977b78cf90154ceb96e68bb905667e01407de581e1d5556a2ccea26c" size="14099283" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a4-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="2681c3052302fa2e791e6c82d2ad48569d8f1622400bd433efe31e7757e8002c0f5c1f2930949f89ee059bc61b2cea2101d56b67f2c506eb6222a0ff709948f6" size="89263680" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="55cd47c65f8c38296547bad978c4fae0e51733de4f7970e1ac9f4d01083ebdc06eecee506bf92f6eb2e64c476fa707c5af33ea0c7838acf44217b8706102471e" size="9557366" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a3…" hashFunction="SHA512" hashValue="f11799aaaa4f95320479b9688ba344916a9b33b894da79c2b0598b302f272bf874c19da4c28a81554b244c08bec98411aec397f2f059b36e98aab8b36a432d4e" size="15271970" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a3-13.5a5…" hashFunction="SHA512" hashValue="e849c7bca7a3794f4cfef54264f2867a16b13dbd3dd82278b057b53c759e472475488950ba94d2d761b472082890d5232dde8dd156f9ccc6d508124f77e602b4" size="15988169" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="f0d2cabd58cadb474073610ecee0a87939625e001802398879ed68d549075af9da6f01b72055df4572bf483d0818c6ca285eca3dc9548d6012ec152892f3576d" size="11946012" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="9801bb54884e7fd6168fe78e5c054df5d16fb37d1778da8d22706931b6e85f8608b3d4ed996cd32dd5abfda3c7a5b3aeae3bc5313c8d202a897b42ca815a3379" size="8561618" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a4-13.5a5…" hashFunction="SHA512" hashValue="9668895bb365476afc343b4bc4ac28bb259ac5b44df034b924081b1dd48a02b022ba712d0f58ac8c3717154e27e1e38ba2e71cb41911487cf9c3e09174ee60d6" size="12175381" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="1666e9f89a4f66caadfde0d07c9aee6d20a83e3fbb9ce402bfa3ccc58eadf2fd8908e666c1dfadd292e2e9597411966506e10196c1598aad30ae16d254a5c101" size="8200880" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4_…" hashFunction="SHA512" hashValue="f4807be1248046f3115f381dbead91fdf8731f3f3ffc76a7eb7bf32eb58f37e3e4cd76861bf6783c53662de6dfd8e3f5e2e193ae49c2828ca8c70eaad512ae9c" size="107916327" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a4-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4_ALL.mar" hashFunction="SHA512" hashValue="05aa6ee66d4dea52c6fec07d45cb0bc96dc813b3f86db418eb86ecf6dccd44e85c0fb1c7c2450d50b35b1ad8da0a7d16ed16f2083fef7e3e1135774ad278908b" size="115308515" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a4-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a4" appVersion="13.5a4" platformVersion="115.7.0" buildID="20240129155630" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a4" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="2681c3052302fa2e791e6c82d2ad48569d8f1622400bd433efe31e7757e8002c0f5c1f2930949f89ee059bc61b2cea2101d56b67f2c506eb6222a0ff709948f6" size="89263680" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a5-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a5-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a5-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4.…","git_tag":"mb-13.5a4-build1","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4.…","version":"13.5a4"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","version":"13.5a5"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4.dmg","git_tag":"mb-13.5a4-build1","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4.dmg.asc","version":"13.5a4"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg.asc","version":"13.5a5"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a4-build1","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-porta…","version":"13.5a4"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","version":"13.5a5"} \ 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.5a4/mullvad-browser-linux-x86_64-13.5a4.…","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-linux-x86_64-13.5a4.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4.dmg","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-macos-13.5a4.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a4/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a4-build1","version":"13.5a4"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a5-build1","version":"13.5a5"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- 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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Implement Android-native Connection Assist UI
by Pier Angelo Vendrame (＠pierov) 26 Feb '24

26 Feb '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 309b109f by clairehurst at 2024-02-22T14:13:24-07:00 fixup! Implement Android-native Connection Assist UI - - - - - 1 changed file: - fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml Changes: ===================================== fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -78,14 +78,14 @@ android:layout_marginStart="24dp" android:layout_marginTop="24dp" android:text="@string/connection_assist_always_connect_automatically_toggle_description" - android:textColor="#FBFBFE" + android:textColor="#80FBFBFE" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@+id/quickstart_switch" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/quickstart_switch" app:layout_constraintVertical_bias="1.25" /> - <com.google.android.material.switchmaterial.SwitchMaterial + <androidx.appcompat.widget.SwitchCompat android:id="@+id/quickstart_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -94,6 +94,7 @@ android:layout_marginBottom="24dp" android:enabled="false" android:gravity="center" + app:thumbTint="#7D6298" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/connect_to_tor_description" app:layout_goneMarginEnd="6dp" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/309… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/309… 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.5a5-build1
by richard (＠richard) 22 Feb '24

22 Feb '24

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

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a5-build1
by richard (＠richard) 22 Feb '24

22 Feb '24

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

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build6
by richard (＠richard) 22 Feb '24

22 Feb '24

richard pushed new tag firefox-android-115.2.1-13.5-1-build6 at The Tor Project / Applications / firefox-android -- 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/mullvad-browser] Pushed new tag mullvad-browser-115.8.0esr-13.5-1-build2
by richard (＠richard) 22 Feb '24

22 Feb '24

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.8.0esr-13.5-1-build2
by richard (＠richard) 22 Feb '24

22 Feb '24

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

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: More minor updates to Mullvad and Tor Browser Release Prep issue templates
by richard (＠richard) 22 Feb '24

22 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0d915f56 by Richard Pospesel at 2024-02-22T13:42:40+00:00 More minor updates to Mullvad and Tor Browser Release Prep issue templates - - - - - 96db74ad by Richard Pospesel at 2024-02-22T16:52:49+00:00 Bug 41074,41075: Tor,Mullvad Browser 13.5a5 Release Prep - - - - - 15 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 - 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/openssl/config - projects/translation/config - rbm.conf Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -66,14 +66,14 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `ChangeLog-MB.txt` - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - [ ] Run `./tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - `$updateArgs` should be these arguments, depending on what you actually updated: - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) - [ ] `--no-script` - [ ] `--ublock` - - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` + - E.g., `./tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output - [ ] Open MR with above changes, using the template for release preparations ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -66,14 +66,14 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] Update `ChangeLog-MB.txt` - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - [ ] Run `./tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - `$updateArgs` should be these arguments, depending on what you actually updated: - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) - [ ] `--no-script` - [ ] `--ublock` - - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` + - E.g., `./tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output - [ ] Open MR with above changes, using the template for release preparations ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -57,6 +57,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - [ ] `browser_branch` : update to match alpha `firefox-android` build tag + - [ ] `browser_build` : update to match alpha `firefox-android` build tag - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` - [ ] Update `projects/translation/config`: @@ -95,7 +96,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `ChangeLog-TBB.txt` - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - [ ] Run `./tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - `$updateArgs` should be these arguments, depending on what you actually updated: @@ -105,7 +106,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] `--openssl` - [ ] `--zlib` - [ ] `--go` - - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` + - E.g., `./tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output - [ ] Open MR with above changes, using the template for release preparations ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -55,8 +55,10 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE **NOTE** we don't currently have any of our own patches for this project - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - - [ ] `browser_branch` : update to match alpha `firefox-android` build tag + - [ ] `fenix_version` : update to match stable `firefox-android` build tag + - [ ] `browser_branch` : update to match stable `firefox-android` build tag + - [ ] `browser_build` : update to match stable `firefox-android` build tag + variant: Beta - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` - [ ] Update `projects/translation/config`: @@ -95,7 +97,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] Update `ChangeLog-TBB.txt` - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - [ ] Run `./tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - `$updateArgs` should be these arguments, depending on what you actually updated: @@ -105,7 +107,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] `--openssl` - [ ] `--zlib` - [ ] `--go` - - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` + - E.g., `./tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output - [ ] Open MR with above changes, using the template for release preparations ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,50 @@ +Mullvad Browser 13.5a5 - February 27 2024 + * All Platforms + * Updated Firefox to 115.8.0esr + * Updated uBlock Origin to 1.56.0 + * Updated mullvad-browser-extension to 0.8.5 + * Bug 262: Mouse-over long links causes the browser element to re-center relative to width of status tooltip [mullvad-browser] + * Bug 268: Rebase Mullvad Browser Alpha onto 115.8.0esr [mullvad-browser] + * Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser] + * Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser] + * Bug 42387: Visual noise in 13.5a4 letterboxing [tor-browser] + * Bug 42389: Betterboxing: gradient is never shown [tor-browser] + * Bug 42390: Betterboxing: make the decorator border disappear when the corners are flat [tor-browser] + * Bug 42397: Change RFP-spoofed Timezone from UTC to a real-world, less discriminable one [tor-browser] + * Bug 42398: Include Alpha and Nightly in MOZ_APP_DISPLAYNAME (and possibly in other places) [tor-browser] + * Bug 42423: Move temporary Lox Fluent strings to new file [tor-browser] + * macOS + * Bug 40569: Create build-specific installer for macOS [tor-browser-build] + * Build System + * All Platforms + * Bug 41038: Add RPM dependencies to README [tor-browser-build] + * Bug 41067: Use Capture::Tiny instead of IO::CaptureOutput [tor-browser-build] + * Bug 41072: Set correct updater_url for Mullvad Browser nightly builds [tor-browser-build] + * Bug 41081: Update detailsURL in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 40068: Switch from IO::CaptureOutput to Capture::Tiny [rbm] + * Bug 40069: Make stdout and stderr utf8 [rbm] + * Bug 40071: Add an option to create zip files using 7z [rbm] + * Bug 40072: Move capture_exec to a separate module [rbm] + * Windows + * Bug 41076: Include the ShellLink plugin in NSIS [tor-browser-build] + * Bug 41077: Draft the new installer for Mullvad Browser [tor-browser-build] + * macOS + * Bug 41084: $app_bundle is missing the final .app in projects/firefox/build [tor-browser-build] + +Mullvad Browser 13.0.10 - February 20 2024 + * All Platforms + * Updated Firefox to 115.8.0esr + * Updated mullvad-browser-extension to 0.8.5 + * Bug 267: Rebase Mullvad Browser Stable onto Firefox 115.8.0esr [mullvad-browser] + * Bug 42374: spoof english leaks via numberingSystem: numbers (non-latn) or decimal separator (latn) [tor-browser] + * Build System + * All Platforms + * Bug 41037: Set time on signing machine before starting signing [tor-browser-build] + * Bug 41067: Use Capture::Tiny instead of IO::CaptureOutput [tor-browser-build] + * Bug 40068: Switch from IO::CaptureOutput to Capture::Tiny [rbm] + * Bug 40069: Make stdout and stderr utf8 [rbm] + Mullvad Browser 13.5a4 - January 29 2024 * All Platforms * Updated Firefox to 115.7.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,75 @@ +Tor Browser 13.5a5 - February 27 2024 + * All Platforms + * Updated OpenSSL to 3.0.13 + * Updated Snowflake to 2.9.0 + * Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser] + * Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser] + * Bug 42390: Betterboxing: make the decorator border disappear when the corners are flat [tor-browser] + * Bug 42397: Change RFP-spoofed Timezone from UTC to a real-world, less discriminable one [tor-browser] + * Bug 42412: Rebase Tor Browser Alpha onto 115.8.0esr [tor-browser] + * Bug 41079: Bump version of Snowflake to v2.9.0 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.8.0esr + * Bug 41814: Change "vanilla bridge:" to "Tor bridge:" in bridge cards [tor-browser] + * Bug 42270: Implement design changes to QR code dialog [tor-browser] + * Bug 42389: Betterboxing: gradient is never shown [tor-browser] + * Bug 42398: Include Alpha and Nightly in MOZ_APP_DISPLAYNAME (and possibly in other places) [tor-browser] + * Bug 42414: Show ellipsis when the tor bridge address overflows [tor-browser] + * Bug 42415: Improve focus styling for forced focus in bridge settings [tor-browser] + * Bug 42421: Remove bridge option should be hidden for Lox bridges [tor-browser] + * Bug 42423: Move temporary Lox Fluent strings to new file [tor-browser] + * Bug 42425: Improve accessibility of the bridge emoji cells [tor-browser] + * Android + * Updated GeckoView to 115.8.0esr + * Bug 42253: Remove "New private tab" action and widget [tor-browser] + * Bug 42402: Remove Android YEC strings [tor-browser] + * Bug 42407: TTP-03-010 WP3: Potential phishing [tor-browser] + * Bug 42416: Backport Android security fixes from Firefox 123 [tor-browser] + * macOS + * Bug 40569: Create build-specific installer for macOS [tor-browser-build] + * Build System + * All Platforms + * Updated Go to 1.20.14 and 1.21.7 + * Bug 41081: Update detailsURL in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 40068: Switch from IO::CaptureOutput to Capture::Tiny [rbm] + * Bug 40069: Make stdout and stderr utf8 [rbm] + * Bug 40071: Add an option to create zip files using 7z [rbm] + * Bug 40072: Move capture_exec to a separate module [rbm] + * Windows + * Bug 41076: Include the ShellLink plugin in NSIS [tor-browser-build] + * macOS + * Bug 41084: $app_bundle is missing the final .app in projects/firefox/build [tor-browser-build] + * Android + * Bug 42399: Re-enable minimization of JS for Android [tor-browser] + * Bug 41080: Re-pack omni.ja with 7-zip on Android [tor-browser-build] + +Tor Browser 13.0.10 - February 20 2024 + * All Platforms + * Updated OpenSSL to 3.0.13 + * Updated zlib to 1.3.1 + * Updated Snowflake to 2.9.0 + * Bug 42374: spoof english leaks via numberingSystem: numbers (non-latn) or decimal separator (latn) [tor-browser] + * Bug 42411: Rebase Tor Browser stable onto 115.8.0esr [tor-browser] + * Bug 41079: Bump version of Snowflake to v2.9.0 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.8.0esr + * Bug 42338: Changing circuit programmatically in Tor Browser not working anymore! [tor-browser] + * Android + * Updated GeckoView to 115.8.0esr + * Bug 42402: Remove Android YEC strings [tor-browser] + * Bug 42416: Backport Android security fixes from Firefox 123 [tor-browser] + * Linux + * Bug 42293: Updater is disabled when tor-browser is run by torbrowser-launcher flatpak [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.20.14 and 1.21.7 + * Bug 41067: Use Capture::Tiny instead of IO::CaptureOutput [tor-browser-build] + * Bug 40067: Use --no-verbose wget option when not running in a terminal [rbm] + * Bug 40068: Switch from IO::CaptureOutput to Capture::Tiny [rbm] + * Bug 40069: Make stdout and stderr utf8 [rbm] + * Bug 40072: Move capture_exec to a separate module [rbm] + Tor Browser 13.5a4 - January 31 2024 * All Platforms * Updated zlib to 1.3.1 ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1149777, + "average_daily_users": 1137843, "categories": { "firefox": [ "web-development", @@ -28,7 +28,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5678786, + "id": 5688757, "compatibility": { "firefox": { "min": "54.0", @@ -39,7 +39,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56787…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56887…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +50,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Improved dark theme detection.\n- Dynamic mode bug fixes.\n- Users' fixes for websites." + "en-US": "- Fixed errors when Adopted Stylesheets were not present.\n- Fixed breaking on ::view-transition selectors (Airbnb issue).\n- Users' fixes for websites." }, - "reviewed": "2024-01-22T11:18:14Z", - "version": "4.9.76", + "reviewed": "2024-02-08T08:33:10Z", + "version": "4.9.77", "files": [ { - "id": 4223104, - "created": "2024-01-17T14:17:21Z", - "hash": "sha256:d3afe139928c3c30bd11347c08a3360fa3417be4667c47f3de19fdc0ab92da9f", + "id": 4233074, + "created": "2024-02-07T11:23:55Z", + "hash": "sha256:931de67e9091c69edd9fd3f348a7ed1de1dce7d136017fed641bd10eb0ae8891", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 723386, + "size": 725369, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4223104/darkreader-4.9.76…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4233074/darkreader-4.9.77…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +143,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-01-22T11:18:14Z", + "last_updated": "2024-02-08T08:33:10Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5479, - "bayesian_average": 4.546785102314431, - "count": 5377, - "text_count": 1689 + "average": 4.5407, + "bayesian_average": 4.539579140237365, + "count": 5441, + "text_count": 1716 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +318,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": 25711 + "weekly_downloads": 24267 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 267473, + "average_daily_users": 264838, "categories": { "firefox": [ "privacy-security" @@ -547,10 +547,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8014, - "bayesian_average": 4.796833851849327, - "count": 1400, - "text_count": 250 + "average": 4.8001, + "bayesian_average": 4.795468550922711, + "count": 1406, + "text_count": 252 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +635,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": 3594 + "weekly_downloads": 3215 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1220177, + "average_daily_users": 1223061, "categories": { "firefox": [ "privacy-security" @@ -660,7 +660,7 @@ "contributions_url": "https://paypal.me/SupportEFF?utm_content=product-page-contribute&utm_medium…", "created": "2014-05-01T18:23:16Z", "current_version": { - "id": 5659023, + "id": 5688386, "compatibility": { "firefox": { "min": "78.0", @@ -671,7 +671,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -682,22 +682,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<ul><li>Improved widget replacement for embedded Tweets</li><li>Fixed blocking WebSocket connections to blocked domains</li><li>Fixed various site breakages</li><li>Added Galician translations in Firefox</li><li>Improved translations (Traditional Chinese, Greek, Japanese)</li></ul>" + "en-US": "<ul><li>Fixed timing issue that could lead to incomplete or empty tracker data on installation in Firefox</li><li>Fixed various UI display issues</li><li>Fixed various site breakages</li><li>Improved translations (Hebrew, Brazilian Portuguese, Swedish, Ukrainian)</li></ul>" }, - "reviewed": "2023-12-07T09:09:12Z", - "version": "2023.12.1", + "reviewed": "2024-02-08T18:59:58Z", + "version": "2024.2.6", "files": [ { - "id": 4203344, - "created": "2023-12-01T19:02:57Z", - "hash": "sha256:aacac794c211fc6ea7dc51529883fd3e477aff37441d29ae7f576ab0f8c737b7", + "id": 4232703, + "created": "2024-02-06T15:04:35Z", + "hash": "sha256:81d80bff29b6209aa444713bc548a3d06fd5bde208c9c3c596dba81cc97add02", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1893319, + "size": 1892384, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4203344/privacy_badger17-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4232703/privacy_badger17-…", "permissions": [ "<all_urls>", "alarms", @@ -1124,7 +1124,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-12-07T09:09:12Z", + "last_updated": "2024-02-08T18:59:58Z", "name": { "en-US": "Privacy Badger" }, @@ -1170,10 +1170,10 @@ "category": "recommended" }, "ratings": { - "average": 4.796, - "bayesian_average": 4.793312997020196, - "count": 2377, - "text_count": 449 + "average": 4.7952, + "bayesian_average": 4.7924799598835, + "count": 2393, + "text_count": 455 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1197,7 +1197,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": 25171 + "weekly_downloads": 21906 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 7634996, + "average_daily_users": 7691950, "categories": { "firefox": [ "privacy-security" @@ -1222,7 +1222,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5672315, + "id": 5693353, "compatibility": { "firefox": { "min": "78.0", @@ -1233,7 +1233,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/56…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1244,22 +1244,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/514b85ddd154153a63fe9c…" rel=\"nofollow\">1.55.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1e03af965f6b7a76aa94f6…" rel=\"nofollow\">Mind drop events in filter expression field of logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e018352ca30c61b4a80c2a…" rel=\"nofollow\">Improve <code>xml-prune</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ec6b213ac8c38077b676e1…" rel=\"nofollow\">Fix message entries overflowing in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a6311ada7aec5e36a802c2…" rel=\"nofollow\">Add support for <code>application/x-javascript</code> in <code>replace=</code> option</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8b0f4ac6d1a68a10f0736a…" rel=\"nofollow\">Extend support for differential updates to imported lists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5e2218ad38a67bad16b5a2…" rel=\"nofollow\">Add detection of mismatched <code>!#if</code>-<code>!#endif</code> in linter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d3d5708132bbca2b9b3232…" rel=\"nofollow\">Support links to update lists which are differential update-friendly</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5da8dae3bfc5fd15895013…" rel=\"nofollow\">Remove \"Purge all caches\" button from \"Filter lists\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f9bd0d08194525f2457cf5…" rel=\"nofollow\">Add support for <code>all</code> list token in updater-link feature</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f266c7ca3a6228a20999be…" rel=\"nofollow\">Fix logging of broad exception filter <code>#@#+js()</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/444dcf1f11a8dacef0553e…" rel=\"nofollow\">Improve <code>no-xhr-if</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5f699ca11537ba17c330a8…" rel=\"nofollow\">Ensure cache storage backend is selected before access</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/983fbc3b50419c274040d9…" rel=\"nofollow\">Fix popup panel rendering when embedded in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2f972ff52f4edc3dc99084…" rel=\"nofollow\">Add visual hint in support information re. differential update</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/75541b4012443bd5602cc0…" rel=\"nofollow\">Remove obsolete web accessible resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8eb76fbc2577032e63698e…" rel=\"nofollow\">Rename <code>urltransform</code> to <code>uritransform</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/43e266ca8d07228388c2a6…" rel=\"nofollow\">Vertically expand/collapse in steps in dom inspector</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d1f0669c5cf9357a9528d8…" rel=\"nofollow\">Reset the DOM inspector when URL in top context changes</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d2f70a310ccc2ce2b2c97c…" rel=\"nofollow\">Support shadow-piercing combinator <code>>>></code> in <code>trusted-click-element</code></a></li><li>[...]</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7d13ab8046ad75d1230ea5…" 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/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>" }, - "reviewed": "2024-01-08T10:26:54Z", - "version": "1.55.0", + "reviewed": "2024-02-20T18:51:52Z", + "version": "1.56.0", "files": [ { - "id": 4216633, - "created": "2024-01-03T20:24:50Z", - "hash": "sha256:a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647", + "id": 4237670, + "created": "2024-02-17T14:54:31Z", + "hash": "sha256:f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3647341, + "size": 3819727, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4216633/ublock_origin-1.5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5…", "permissions": [ "alarms", "dns", @@ -1379,7 +1379,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-01-21T19:40:21Z", + "last_updated": "2024-02-20T18:51:52Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1524,10 +1524,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7869, - "bayesian_average": 4.786526880140991, - "count": 17099, - "text_count": 4466 + "average": 4.7887, + "bayesian_average": 4.788323774199536, + "count": 17283, + "text_count": 4511 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1590,7 +1590,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": 191212 + "weekly_downloads": 170114 }, "notes": null }, @@ -1606,7 +1606,7 @@ "picture_url": null } ], - "average_daily_users": 177037, + "average_daily_users": 177359, "categories": { "firefox": [ "photos-music-videos", @@ -1702,10 +1702,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4783, - "bayesian_average": 4.473306026343802, - "count": 1177, - "text_count": 445 + "average": 4.4571, + "bayesian_average": 4.452141766560867, + "count": 1201, + "text_count": 460 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1727,7 +1727,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": 433 + "weekly_downloads": 466 }, "notes": null }, @@ -1743,7 +1743,7 @@ "picture_url": null } ], - "average_daily_users": 81898, + "average_daily_users": 79283, "categories": { "firefox": [ "privacy-security", @@ -1853,9 +1853,9 @@ ], "promoted": null, "ratings": { - "average": 4.3802, - "bayesian_average": 4.366169675126323, - "count": 405, + "average": 4.3787, + "bayesian_average": 4.364570736907983, + "count": 404, "text_count": 113 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", @@ -1878,7 +1878,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": 1389 + "weekly_downloads": 1367 }, "notes": null }, @@ -1894,7 +1894,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 299174, + "average_daily_users": 302489, "categories": { "firefox": [ "search-tools", @@ -1905,7 +1905,7 @@ "contributions_url": "https://www.paypal.com/donate?hosted_button_id=GLL4UNSNU6SQN&utm_content=pr…", "created": "2017-06-17T15:23:33Z", "current_version": { - "id": 5665608, + "id": 5683352, "compatibility": { "firefox": { "min": "115.0", @@ -1916,7 +1916,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1929,20 +1929,20 @@ "release_notes": { "en-US": "Learn more about this release from the <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d50855f24f77fa6f2614b9…" rel=\"nofollow\">changelog</a>." }, - "reviewed": "2023-12-19T14:03:13Z", - "version": "6.1.1", + "reviewed": "2024-01-31T11:30:38Z", + "version": "6.1.2", "files": [ { - "id": 4209928, - "created": "2023-12-17T01:28:51Z", - "hash": "sha256:254d78084e332190a2b6ccb1959a42257bdc287addc0685419fcde7df1a52e76", + "id": 4227669, + "created": "2024-01-27T08:06:28Z", + "hash": "sha256:fed46723702c79d0d2dcd2132901402b6c391f9fef8efbb58635b5ea9e47476f", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1165289, + "size": 1165290, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4209928/search_by_image-6…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4227669/search_by_image-6…", "permissions": [ "alarms", "contextMenus", @@ -1985,7 +1985,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-12-19T14:03:13Z", + "last_updated": "2024-01-31T11:30:38Z", "name": { "en-US": "Search by Image" }, @@ -2111,10 +2111,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6458, - "bayesian_average": 4.641373152099238, - "count": 1389, - "text_count": 269 + "average": 4.6464, + "bayesian_average": 4.641961457940663, + "count": 1411, + "text_count": 273 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2129,13 +2129,15 @@ "en-US": "https://github.com/dessant/search-by-image/issues" }, "tags": [ + "google", "image search", + "pinterest", "search" ], "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": 6874 + "weekly_downloads": 5867 }, "notes": null }, @@ -2158,7 +2160,7 @@ "picture_url": null } ], - "average_daily_users": 123628, + "average_daily_users": 124312, "categories": { "firefox": [ "search-tools", @@ -2439,10 +2441,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3745, - "bayesian_average": 4.37014166071391, - "count": 1311, - "text_count": 371 + "average": 4.3717, + "bayesian_average": 4.36732284678191, + "count": 1329, + "text_count": 376 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2462,7 +2464,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": 52 + "weekly_downloads": 37 }, "notes": null }, @@ -2478,7 +2480,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 313064, + "average_daily_users": 308206, "categories": { "firefox": [ "web-development", @@ -2665,9 +2667,9 @@ "category": "recommended" }, "ratings": { - "average": 4.3947, - "bayesian_average": 4.3920505434632835, - "count": 2171, + "average": 4.3956, + "bayesian_average": 4.3929050879959695, + "count": 2174, "text_count": 837 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", @@ -2712,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": 7762 + "weekly_downloads": 7240 }, "notes": null }, @@ -2728,7 +2730,7 @@ "picture_url": null } ], - "average_daily_users": 162394, + "average_daily_users": 161419, "categories": { "firefox": [ "photos-music-videos", @@ -2838,9 +2840,9 @@ }, "ratings": { "average": 3.8734, - "bayesian_average": 3.869354081107614, - "count": 1216, - "text_count": 441 + "bayesian_average": 3.8693074295625123, + "count": 1224, + "text_count": 443 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2859,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": 3206 + "weekly_downloads": 1652 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -99,13 +99,13 @@ 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/4216633/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5… name: ublock-origin - sha256sum: a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647 + sha256sum: f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be enable: '[% c("var/mullvad-browser") %]' - - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0… + - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.5-firef… name: mullvad-extension - sha256sum: a0057a37482e178331cde7a6fd3c100315fcfc26e804aa37c9281f412d24cb79 + sha256sum: b8208cc73d3c3c87342b25367b1a5fa330cb528f3213a4c4de30512f1662ff45 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 5 + browser_build: 6 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.8.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.13[% ELSE %]1.21.6[% END %]' +version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.7[% END %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -121,11 +121,11 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 + sha256sum: 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 0fe745c530f2f1d67193af3c5ea25246be077989ec5178df266e975f3532449e + sha256sum: 1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b67f4e enable: '[% c("var/use_go_1_20") %]' - project: go-bootstrap name: go-bootstrap ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.0.12 +version: 3.0.13 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -33,4 +33,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 + sha256sum: 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: cbd9b6c415ec2edb99237ef67ccd4f033a7b9c2a + git_hash: 3215fb9ae37cb115b607647122f0984a8a428b16 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 799998ee13be225222afc6cfda1687cf63d6cc9e + git_hash: f1a4b3d9af145b062b1a5b0cf2b83bd6bfcd03bb 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: 9622d5c3f3ffd2400fc1bbd4bb7c507f257f9bbb + git_hash: 44409d6f28faf0e332a00d53de67879de41bf07c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -81,12 +81,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5a4' - torbrowser_build: 'build2' + torbrowser_version: '13.5a5' + torbrowser_build: 'build1' torbrowser_incremental_from: - - '13.5a1' - - '13.5a2' + - '13.5a4' - '13.5a3' + - '13.5a2' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 22 Feb '24

22 Feb '24

richard pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: cab718d4 by Henry Wilkes at 2024-02-22T16:50:41+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42421: Hide the option to remove individual Lox bridges. We also adjust the "Remove all bridges" callback to simply set the "TorSettings.bridge.source" to be "Invalid" since this is more source-independent, and TorSettings will handle clearing the bridge strings for us. - - - - - 1 changed file: - browser/components/torpreferences/content/connectionPane.js Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -730,11 +730,15 @@ const gBridgeGrid = { const qrItem = row.menu.querySelector( ".tor-bridges-options-qr-one-menu-item" ); + const removeItem = row.menu.querySelector( + ".tor-bridges-options-remove-one-menu-item" + ); row.menu.addEventListener("showing", () => { - qrItem.hidden = !( + const show = this._bridgeSource === TorBridgeSource.UserProvided || - this._bridgeSource === TorBridgeSource.BridgeDB - ); + this._bridgeSource === TorBridgeSource.BridgeDB; + qrItem.hidden = !show; + removeItem.hidden = !show; }); qrItem.addEventListener("click", () => { @@ -752,21 +756,19 @@ const gBridgeGrid = { ].getService(Ci.nsIClipboardHelper); clipboard.copyString(row.bridgeLine); }); - row.menu - .querySelector(".tor-bridges-options-remove-one-menu-item") - .addEventListener("click", () => { - const bridgeLine = row.bridgeLine; - const strings = TorSettings.bridges.bridge_strings; - const index = strings.indexOf(bridgeLine); - if (index === -1) { - return; - } - strings.splice(index, 1); + removeItem.addEventListener("click", () => { + const bridgeLine = row.bridgeLine; + const strings = TorSettings.bridges.bridge_strings; + const index = strings.indexOf(bridgeLine); + if (index === -1) { + return; + } + strings.splice(index, 1); - setTorSettings(() => { - TorSettings.bridges.bridge_strings = strings; - }); + setTorSettings(() => { + TorSettings.bridges.bridge_strings = strings; }); + }); }, /** @@ -2016,7 +2018,7 @@ const gBridgeSettings = { setTorSettings(() => { // This should always have the side effect of disabling bridges as // well. - TorSettings.bridges.bridge_strings = []; + TorSettings.bridges.source = TorBridgeSource.Invalid; }); }); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cab718d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cab718d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 22 Feb '24

22 Feb '24

richard pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 0697c148 by Henry Wilkes at 2024-02-22T15:13:53+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42425: Move the accessible name of the emoji cells from the cell to its image child. NVDA only reads the text content of a cell when navigating a "table". Also, change the "table" in the user provide dialog to use the role "cell" rather than "gridcell" (the later is only meant for the "grid" role). The "Emoji" description is incorporated into the "alt" of the image instead. Before the description was not read out when doing screen reader table navigation with either Orca or NVDA. - - - - - f2e7749d by Henry Wilkes at 2024-02-22T15:13:54+00:00 fixup! Tor Browser strings Bug 42425: Move the bridge emoji accessible name into the image. - - - - - 5 changed files: - browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.js - browser/components/torpreferences/content/provideBridgeDialog.xhtml - browser/locales/en-US/browser/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js ===================================== @@ -119,7 +119,7 @@ doc.defaultView.console.error(`No emoji for index ${this.#index}`); emojiName = unknownString; } - doc.l10n.setAttributes(this, "tor-bridges-emoji-cell", { + doc.l10n.setAttributes(this.#img, "tor-bridges-emoji-image", { emojiName, }); } ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -253,19 +253,11 @@ const gBridgeGrid = { */ _rowTemplate: null, - /** - * @typedef {object} EmojiCell - * - * @property {Element} cell - The grid cell element. - * @property {Element} img - The grid cell icon. - * @property {Element} index - The emoji index. - */ /** * @typedef {object} BridgeGridRow * * @property {Element} element - The row element. * @property {Element} optionsButton - The options button. - * @property {EmojiCell[]} emojis - The emoji cells. * @property {Element} menu - The options menupopup. * @property {Element} statusEl - The bridge status element. * @property {Element} statusText - The status text. ===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -469,7 +469,7 @@ const gProvideBridgeDialog = { for (const cell of BridgeEmoji.createForAddress(bridgeLine)) { // Each emoji is its own cell, we rely on the fact that createForAddress // always returns four elements. - cell.setAttribute("role", "gridcell"); + cell.setAttribute("role", "cell"); cell.classList.add("tor-bridges-grid-cell", "tor-bridges-emoji-cell"); emojiBlock.append(cell); } ===================================== browser/components/torpreferences/content/provideBridgeDialog.xhtml ===================================== @@ -75,13 +75,13 @@ <html:div class="tor-bridges-grid-row" role="row"> <html:span class="tor-bridges-type-cell tor-bridges-grid-cell" - role="gridcell" + role="cell" ></html:span> <html:span class="tor-bridges-emojis-block" role="none"></html:span> <html:span class="tor-bridges-grid-end-block" role="none"> <html:span class="tor-bridges-address-cell tor-bridges-grid-cell" - role="gridcell" + role="cell" > <html:span class="tor-bridges-address-cell-text"></html:span> </html:span> ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -84,12 +84,11 @@ tor-bridges-built-in-status-connected = Connected tor-bridges-type-prefix = { $type } bridge: # Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla"). tor-bridges-type-prefix-generic = Tor bridge: -# The name and accessible description for a bridge emoji cell. Each bridge address can be hashed into four emojis shown to the user (bridgemoji feature). This cell corresponds to a *single* such emoji. The "title" should just be emojiName. The "aria-description" should give screen reader users enough of a hint that the cell contains a single emoji. +# Used for an image of a bridge emoji. Each bridge address can be hashed into four emojis shown to the user (bridgemoji feature). This string corresponds to a *single* such emoji. The "title" should just be emojiName. The "alt" should let screen readers know that the image is of a *single* emoji, as well as its name. # $emojiName (String) - The name of the emoji, already localized. -# E.g. with Orca screen reader in en-US this would read "unicorn. Row 2 Column 2. Emoji". -tor-bridges-emoji-cell = +tor-bridges-emoji-image = + .alt = Emoji: { $emojiName } .title = { $emojiName } - .aria-description = Emoji # The emoji name to show on hover when a bridge emoji's name is unknown. tor-bridges-emoji-unknown = Unknown # Shown when the bridge has been used for the most recent Tor circuit, i.e. the most recent bridge we have connected to. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4b5aa8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4b5aa8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! MB 37: Customization for the about dialog
by Pier Angelo Vendrame (＠pierov) 22 Feb '24

22 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: f3f3820b by Pier Angelo Vendrame at 2024-02-22T17:06:34+01:00 fixup! MB 37: Customization for the about dialog MB 270: Update support email - - - - - 2 changed files: - browser/base/content/aboutDialog.xhtml - browser/locales/en-US/browser/aboutDialogMullvad.ftl Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -138,7 +138,7 @@ <description class="text-blurb"> <label is="text-link" href="https://mullvad.net/browser" data-l10n-id="mullvad-about-readMore"/> </description> - <description class="text-blurb" data-l10n-id="mullvad-about-feedback"/> + <description class="text-blurb" data-l10n-id="mullvad-about-feedback2" data-l10n-args='{"emailAddress":"support(a)mullvadvpn.net"}'/> </vbox> </vbox> </hbox> ===================================== browser/locales/en-US/browser/aboutDialogMullvad.ftl ===================================== @@ -4,5 +4,5 @@ mullvad-about-desc = { -brand-short-name } is a privacy-focused web browser developed in collaboration between <label data-l10n-name="mullvad-about-mullvadLink">Mullvad VPN</label> and the <label data-l10n-name="mullvad-about-torProjectLink">Tor Project</label>. It’s produced to minimize tracking and fingerprinting. mullvad-about-readMore = Read more -mullvad-about-feedback = Help & feedback: support(a)mullvad.net +mullvad-about-feedback2 = Help & feedback: { $emailAddress } mullvad-about-telemetryLink = Telemetry View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f3f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f3f… 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] 4 commits: fixup! Modify build system
by Pier Angelo Vendrame (＠pierov) 22 Feb '24

22 Feb '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 6c3669ee by clairehurst at 2024-02-21T18:55:49-07:00 fixup! Modify build system - - - - - cd3473f6 by clairehurst at 2024-02-21T20:41:44-07:00 fixup! Add Tor integration and UI Remove quick start - - - - - 5e60c209 by clairehurst at 2024-02-21T21:10:03-07:00 Implement Android-native Connection Assist UI - - - - - 7c1cc539 by clairehurst at 2024-02-21T21:10:03-07:00 fixup! Enable the connect assist experiments on alpha - - - - - 22 changed files: - fenix/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt - fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBetaConnectionFeaturesFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.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/TorController.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt - − fenix/app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt - + fenix/app/src/main/res/drawable/connect.xml - fenix/app/src/main/res/drawable/progress_gradient.xml - + fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - fenix/app/src/main/res/layout/tor_bootstrap_connect.xml - fenix/app/src/main/res/layout/tor_network_settings_beta_connection_features.xml - fenix/app/src/main/res/navigation/nav_graph.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/torbrowser_strings.xml - fenix/tools/tba-fetch-deps.sh Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt ===================================== @@ -41,4 +41,5 @@ enum class BrowserDirection(@IdRes val fragmentId: Int) { FromLoginDetailFragment(R.id.loginDetailFragment), FromTabsTray(R.id.tabsTrayFragment), FromRecentlyClosed(R.id.recentlyClosedFragment), + FromTorConnectionAssistFragment(R.id.torConnectionAssistFragment) } ===================================== fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -157,6 +157,7 @@ import org.mozilla.fenix.tabstray.TabsTrayFragment import org.mozilla.fenix.tabstray.TabsTrayFragmentDirections import org.mozilla.fenix.theme.DefaultThemeManager import org.mozilla.fenix.theme.ThemeManager +import org.mozilla.fenix.tor.TorConnectionAssistFragmentDirections import org.mozilla.fenix.tor.TorEvents import org.mozilla.fenix.trackingprotection.TrackingProtectionPanelDialogFragmentDirections import org.mozilla.fenix.utils.BrowsersCache @@ -1085,6 +1086,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn BrowserDirection.FromStudiesFragment -> StudiesFragmentDirections.actionGlobalBrowser( customTabSessionId, ) + BrowserDirection.FromTorConnectionAssistFragment, + -> TorConnectionAssistFragmentDirections.actionGlobalBrowser( + customTabSessionId, + ) } /** ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -115,7 +115,6 @@ import org.mozilla.fenix.search.toolbar.SearchSelectorMenu import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.TorBootstrapFragmentDirections import org.mozilla.fenix.tor.TorBootstrapStatus -import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.Wallpaper @@ -202,7 +201,6 @@ class HomeFragment : Fragment() { private val recentBookmarksFeature = ViewBoundFeatureWrapper<RecentBookmarksFeature>() private val historyMetadataFeature = ViewBoundFeatureWrapper<RecentVisitsFeature>() private val searchSelectorBinding = ViewBoundFeatureWrapper<SearchSelectorBinding>() - private val torQuickStart by lazy { TorQuickStart(requireContext()) } private val searchSelectorMenuBinding = ViewBoundFeatureWrapper<SearchSelectorMenuBinding>() private lateinit var torBootstrapStatus: TorBootstrapStatus @@ -236,7 +234,6 @@ class HomeFragment : Fragment() { val components = requireComponents torBootstrapStatus = TorBootstrapStatus( - torQuickStart, !BuildConfig.DISABLE_TOR, components.torController, ::dispatchModeChanges ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBetaConnectionFeaturesFragment.kt ===================================== @@ -54,10 +54,7 @@ class TorBetaConnectionFeaturesFragment : Fragment() { children.forEach { it.isEnabled = false } } } else { - // Do not enable the native UI until it is actually available. - // binding.enableBetaConnectionFeaturesModes.children.forEach { it.isEnabled = true } - binding.useNewBootstrapWithHtmlUiRadioButton.isEnabled = true - binding.useNewBootstrapWithNativeUiRadioButton.isEnabled = false + binding.enableBetaConnectionFeaturesModes.children.forEach { it.isEnabled = true } } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -8,14 +8,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.annotation.VisibleForTesting import androidx.core.view.children import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.databinding.FragmentHomeBinding import org.mozilla.fenix.ext.requireComponents -import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.tor.interactor.DefaultTorBootstrapInteractor import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor import androidx.navigation.fragment.findNavController @@ -30,7 +28,6 @@ import org.mozilla.fenix.tor.view.TorBootstrapView @Suppress("TooManyFunctions", "LargeClass") class TorBootstrapFragment : Fragment() { - private val torQuickStart by lazy { TorQuickStart(requireContext()) } internal var _binding: FragmentHomeBinding? = null private val binding get() = _binding!! @@ -55,7 +52,6 @@ class TorBootstrapFragment : Fragment() { val components = requireComponents torBootstrapStatus = TorBootstrapStatus( - torQuickStart, !BuildConfig.DISABLE_TOR, components.torController, ::dispatchModeChanges ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt ===================================== @@ -4,11 +4,8 @@ package org.mozilla.fenix.tor -import org.mozilla.fenix.tor.bootstrap.TorQuickStart - @SuppressWarnings("LongParameterList", "TooManyFunctions") class TorBootstrapStatus( - private val torQuickStart: TorQuickStart, private val shouldStartTor: Boolean, private val torController: TorController, private val dispatchModeChanges: (isShouldBootstrap: Boolean) -> Unit @@ -18,7 +15,7 @@ class TorBootstrapStatus( torController.registerTorListener(this) } - fun isBootstrapping() = (shouldStartTor && (!torQuickStart.quickStartTor() && !torController.isBootstrapped)) + fun isBootstrapping() = (shouldStartTor && !torController.isBootstrapped) @SuppressWarnings("EmptyFunctionBlock") ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -0,0 +1,131 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.os.Build +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import androidx.navigation.fragment.findNavController +import kotlinx.coroutines.launch +import org.mozilla.fenix.R +import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding +import org.mozilla.fenix.ext.hideToolbar + +class TorConnectionAssistFragment : Fragment() { + + private var _binding: FragmentTorConnectionAssistBinding? = null + private val binding get() = _binding!! + + private val viewModel: TorConnectionAssistViewModel by viewModels() + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = FragmentTorConnectionAssistBinding.inflate( + inflater, container, false, + ) + + return binding.root + } + + override fun onResume() { + super.onResume() + hideToolbar() + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.torConnectState.collect { + when (it) { + TorConnectState.Initial -> showConfiguring() + TorConnectState.Configuring -> showConfiguring() + TorConnectState.AutoBootstrapping -> showBootstrapping() + TorConnectState.Bootstrapping -> showBootstrapping() + TorConnectState.Error -> TODO() + TorConnectState.Bootstrapped -> openHome() + TorConnectState.Disabled -> openHome() + } + } + } + } + + viewModel.progress().observe( + viewLifecycleOwner, + ) { progress -> + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + binding.torBootstrapProgressBar.setProgress(progress, true) + } else { + binding.torBootstrapProgressBar.progress = progress + } + } + + viewModel.quickconnectToggle().observe( + viewLifecycleOwner + ) { + binding.quickstartSwitch.isChecked = it + } + + binding.settingsButton.setOnClickListener { + viewModel.cancelTorBootstrap() + openSettings() + } + + binding.torBootstrapConnectButton.setOnClickListener { + viewModel.handleConnect(lifecycleScope = lifecycleScope) + } + + binding.quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> + viewModel.handleQuickstartChecked(isChecked) + } + } + + private fun showConfiguring() { + binding.torBootstrapConnectButton.visibility = View.VISIBLE + binding.torBootstrapNetworkSettingsButton.text = + getString(R.string.connection_assist_configure_connection_button) + binding.torBootstrapNetworkSettingsButton.setOnClickListener { + openTorNetworkSettings() + } + } + + private fun showBootstrapping() { + binding.torBootstrapConnectButton.visibility = View.INVISIBLE + binding.torBootstrapNetworkSettingsButton.text = getString(R.string.btn_cancel) + binding.torBootstrapNetworkSettingsButton.setOnClickListener { + viewModel.cancelTorBootstrap() + } + } + + private fun openSettings(preferenceToScrollTo: String? = null) { + findNavController().navigate( + TorConnectionAssistFragmentDirections + .actionTorConnectionAssistFragmentToSettingsFragment(preferenceToScrollTo), + ) + } + + private fun openTorNetworkSettings() { + findNavController().navigate( + TorConnectionAssistFragmentDirections + .actionTorConnectionAssistFragmentToTorNetworkSettings(), + ) + } + + private fun openHome() { + findNavController().navigate(TorConnectionAssistFragmentDirections.actionStartupHome()) + } + +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -0,0 +1,86 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.app.Application +import android.util.Log +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LifecycleCoroutineScope +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import org.mozilla.fenix.ext.components + +class TorConnectionAssistViewModel( + application: Application, +) : AndroidViewModel(application), TorEvents { + + private val TAG = "torConnectionAssistVM" + private val components = getApplication<Application>().components + + private val _torController: TorControllerGV = components.torController as TorControllerGV + + private val _torConnectState = MutableStateFlow(TorConnectState.Initial) + internal val torConnectState: StateFlow<TorConnectState> = _torConnectState + + init { + _torController.registerTorListener(this) + } + + private val _progress = MutableLiveData(0) + fun progress(): LiveData<Int> { + return _progress + } + + private val _quickconnectToggle = MutableLiveData(_torController.quickstart) + fun quickconnectToggle(): LiveData<Boolean> { + return _quickconnectToggle + } + + fun handleConnect( + withDebugLogging: Boolean = false, + lifecycleScope: LifecycleCoroutineScope? = null, + ) { + _torController.initiateTorBootstrap( + withDebugLogging = withDebugLogging, + lifecycleScope = lifecycleScope, + ) + } + + fun handleQuickstartChecked(checked: Boolean) { + _torController.quickstart = checked + } + + fun cancelTorBootstrap() { + _torController.stopTor() + _torController.setTorStopped() + } + + override fun onTorConnecting() { + Log.d(TAG, "onTorConnecting()") + } + + override fun onTorConnected() { + Log.d(TAG, "onTorConnected()") + _torController.unregisterTorListener(this) + _torConnectState.value = _torController.lastKnownStatus + } + + override fun onTorStatusUpdate(entry: String?, status: String?, progress: Double?) { + Log.d(TAG, "onTorStatusUpdate($entry, $status, $progress)") + if (progress != null) { + _progress.value = progress.toInt() + } + _torConnectState.value = _torController.lastKnownStatus + } + + override fun onTorStopped() { + Log.d(TAG, "onTorStopped()") + _progress.value = 0 + _torConnectState.value = _torController.lastKnownStatus + } + +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -49,6 +49,7 @@ interface TorController: TorEvents { var bridgesEnabled: Boolean var bridgeTransport: TorBridgeTransportConfig var userProvidedBridges: String? + var quickstart: Boolean fun start() fun stop() ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -52,7 +52,7 @@ class TorControllerGV( private var torListeners = mutableListOf<TorEvents>() - private var lastKnownStatus = TorConnectState.Initial + internal var lastKnownStatus = TorConnectState.Initial private var wasTorBootstrapped = false private var isTorRestarting = false @@ -66,6 +66,17 @@ class TorControllerGV( override val isBootstrapped get() = isTorBootstrapped override val isConnected get() = (lastKnownStatus.isStarted() && !isTorRestarting) + override var quickstart: Boolean + get() { + return getTorSettings()?.quickstart ?: false + } + set(value) { + getTorSettings()?.let { + it.quickstart = value + getTorIntegration().setSettings(it, true, true) + } + } + private fun getTorIntegration(): TorIntegrationAndroid { return (context.components.core.engine as GeckoEngine).getTorIntegrationController() } @@ -198,7 +209,7 @@ class TorControllerGV( } override fun setTorStopped() { - lastKnownStatus = TorConnectState.Disabled + lastKnownStatus = TorConnectState.Configuring onTorStopped() } @@ -243,7 +254,7 @@ class TorControllerGV( if (isTorRestarting) { initiateTorBootstrap() } else { - onTorStopped() + setTorStopped() } } @@ -280,6 +291,7 @@ class TorControllerGV( // TorEventsBootstrapStateChangeListener override fun onBootstrapError(message: String?, details: String?) { lastKnownStatus = TorConnectState.Error + onBootstrapStateChange(TorConnectState.Error.state) } // TorEventsBootstrapStateChangeListener ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt ===================================== @@ -19,6 +19,7 @@ class TorControllerTAS (private val context: Context): TorController { private val lbm: LocalBroadcastManager = LocalBroadcastManager.getInstance(context) private val entries = mutableListOf<Pair<String?, String?>>() override val logEntries get() = entries + override var quickstart: Boolean = false // Stub, is never used private var torListeners = mutableListOf<TorEvents>() ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt deleted ===================================== @@ -1,54 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.tor.bootstrap - -import android.content.Context -import android.content.SharedPreferences -import android.os.StrictMode -import androidx.annotation.VisibleForTesting -import mozilla.components.support.ktx.android.content.PreferencesHolder -import mozilla.components.support.ktx.android.content.booleanPreference -import org.mozilla.fenix.ext.components - -class TorQuickStart(val context: Context) : PreferencesHolder { - - override val preferences: SharedPreferences = - context.components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { - context.getSharedPreferences( - PREF_NAME_TOR_BOOTSTRAP_KEY, - Context.MODE_PRIVATE - ) - } - - private var torQuickStart by booleanPreference(TOR_QUICK_START, default = false) - - fun quickStartTor() = - context.components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { torQuickStart } - - fun enableQuickStartTor() { - torQuickStart = true - } - fun disableQuickStartTor() { - torQuickStart = false - } - fun setQuickStartTor(enabled: Boolean) = if (enabled) { - enableQuickStartTor() - } else { - disableQuickStartTor() - } - - companion object { - /** - * Name of the shared preferences file. - */ - private const val PREF_NAME_TOR_BOOTSTRAP_KEY = "tor.bootstrap" - - /** - * Key for [quickStartTor]. - */ - @VisibleForTesting - internal const val TOR_QUICK_START = "tor.bootstrap.quick_start_enabled" - } -} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt ===================================== @@ -10,7 +10,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.Components import org.mozilla.fenix.databinding.TorBootstrapConnectBinding import org.mozilla.fenix.tor.TorEvents -import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor class TorBootstrapConnectViewHolder( @@ -23,17 +22,6 @@ class TorBootstrapConnectViewHolder( init { binding = TorBootstrapConnectBinding.bind(view) - val torQuickStart = TorQuickStart(view.context) - setQuickStartDescription(view, torQuickStart) - - with(binding.quickStartToggle) { - setOnCheckedChangeListener { _, isChecked -> - torQuickStart.setQuickStartTor(isChecked) - setQuickStartDescription(view, torQuickStart) - } - - isChecked = torQuickStart.quickStartTor() - } with(binding.torBootstrapNetworkSettingsButton) { setOnClickListener { @@ -66,20 +54,6 @@ class TorBootstrapConnectViewHolder( components.torController.registerTorListener(this) } - private fun setQuickStartDescription(view: View, torQuickStart: TorQuickStart) { - val resources = view.context.resources - val appName = resources.getString(R.string.app_name) - if (torQuickStart.quickStartTor()) { - binding.torBootstrapQuickStartDescription.text = resources.getString( - R.string.tor_bootstrap_quick_start_enabled, appName - ) - } else { - binding.torBootstrapQuickStartDescription.text = resources.getString( - R.string.tor_bootstrap_quick_start_disabled - ) - } - } - @SuppressWarnings("EmptyFunctionBlock") override fun onTorConnecting() { } ===================================== fenix/app/src/main/res/drawable/connect.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"> + <path + android:pathData="M20,1.253C9.647,1.253 1.253,9.647 1.253,20C1.253,28.967 7.547,36.46 15.96,38.307C16.84,38.5 17.733,38.633 18.653,38.693V24.373C16.787,23.8 15.427,22.06 15.427,20C15.427,17.473 17.473,15.427 20,15.427C22.527,15.427 24.573,17.473 24.573,20C24.573,22.06 23.213,23.8 21.347,24.373V38.693C22.267,38.633 23.16,38.5 24.04,38.307C32.453,36.46 38.747,28.967 38.747,20C38.747,9.647 30.353,1.253 20,1.253ZM24.04,35.293V26.32C26.12,24.987 27.5,22.653 27.5,20C27.5,15.86 24.14,12.5 20,12.5C15.86,12.5 12.5,15.86 12.5,20C12.5,22.653 13.88,24.987 15.96,26.32V35.293C9.18,33.513 4.18,27.347 4.18,20C4.18,11.26 11.26,4.18 20,4.18C28.74,4.18 35.82,11.26 35.82,20C35.82,27.347 30.82,33.513 24.04,35.293Z" + android:fillColor="#FBFBFE" + android:fillType="evenOdd"/> + <path + android:pathData="M20,6.873C12.753,6.873 6.873,12.753 6.873,20C6.873,25.84 10.687,30.787 15.96,32.487V29.36C12.34,27.8 9.807,24.193 9.807,20C9.807,14.367 14.367,9.807 20,9.807C25.633,9.807 30.193,14.367 30.193,20C30.193,24.193 27.66,27.8 24.04,29.36V32.487C29.313,30.787 33.127,25.84 33.127,20C33.127,12.753 27.247,6.873 20,6.873Z" + android:fillColor="#FBFBFE" + android:fillType="evenOdd"/> + <path + android:pathData="M20,22.1C21.16,22.1 22.1,21.159 22.1,20C22.1,18.84 21.16,17.9 20,17.9C18.84,17.9 17.9,18.84 17.9,20C17.9,21.159 18.84,22.1 20,22.1Z" + android:fillColor="#FBFBFE"/> +</vector> ===================================== fenix/app/src/main/res/drawable/progress_gradient.xml ===================================== @@ -12,16 +12,10 @@ <item android:id="@android:id/progress"> <scale android:scaleWidth="100%"> <shape> - <corners - android:bottomLeftRadius="0dp" - android:bottomRightRadius="8dp" - android:topLeftRadius="0dp" - android:topRightRadius="8dp"/> <gradient - android:angle="45" - android:centerColor="#F10366" - android:endColor="#FF9100" - android:startColor="#6173FF" /> + android:angle="0" + android:endColor="#00DBDE" + android:startColor="#FC00FF"/> </shape> </scale> </item> ===================================== fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/tor_bootstrap_background_gradient"> + + <ProgressBar + android:id="@+id/tor_bootstrap_progress_bar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="6dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/settings_button" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginTop="26dp" + android:layout_marginEnd="20dp" + android:contentDescription="@string/settings" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/mozac_ic_settings" /> + + <ImageView + android:id="@+id/tor_connect_image" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_marginStart="24dp" + android:contentDescription="@string/tor_bootstrap_connect" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tor_bootstrap_progress_bar" + app:layout_constraintVertical_bias="0.075" + app:srcCompat="@drawable/connect" /> + + <TextView + android:id="@+id/title_large_text_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginTop="24dp" + android:layout_marginEnd="24dp" + android:text="@string/connection_assist_tor_connect_title" + android:textColor="#FBFBFE" + android:textFontWeight="400" + android:textSize="22sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tor_connect_image" /> + + <TextView + android:id="@+id/connect_to_tor_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="24dp" + android:text="@string/preferences_tor_network_settings_explanation" + android:textColor="#FBFBFE" + android:textFontWeight="400" + android:textSize="14sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/title_large_text_view" /> + + <TextView + android:id="@+id/connect_automatically" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginTop="24dp" + android:text="@string/connection_assist_always_connect_automatically_toggle_description" + android:textColor="#FBFBFE" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@+id/quickstart_switch" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/quickstart_switch" + app:layout_constraintVertical_bias="1.25" /> + + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/quickstart_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="24dp" + android:enabled="false" + android:gravity="center" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/connect_to_tor_description" + app:layout_goneMarginEnd="6dp" + app:layout_goneMarginTop="9dp" /> + + <Button + android:id="@+id/tor_bootstrap_connect_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="8dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/connect_button_purple" + android:maxWidth="312dp" + android:text="@string/tor_bootstrap_connect" + android:textAllCaps="false" + android:textColor="#FBFBFE" + android:textFontWeight="500" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/tor_bootstrap_network_settings_button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/quickstart_switch" + app:layout_constraintVertical_bias="1" /> + + + <Button + android:id="@+id/tor_bootstrap_network_settings_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="24dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/configure_connection_button_white" + android:maxWidth="312dp" + android:text="@string/connection_assist_configure_connection_button" + android:textAllCaps="false" + android:textColor="#15141A" + android:textFontWeight="500" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== fenix/app/src/main/res/layout/tor_bootstrap_connect.xml ===================================== @@ -44,42 +44,6 @@ android:layout_height="wrap_content" android:layout_above="@id/tor_bootstrap_connect_button" /> - <TextView - android:id="@+id/quick_start_label" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/library_item_icon_margin_horizontal" - android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal" - android:layout_above="@id/tor_bootstrap_quick_start_description" - android:layout_toEndOf="@id/quick_start_toggle" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:clickable="false" - android:textAppearance="@style/ListItemTextStyle" - android:textColor="#EEEEEE" - android:text="@string/tor_bootstrap_quick_start_label" - android:textSize="18sp" /> - - <TextView - android:id="@+id/tor_bootstrap_quick_start_description" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/library_item_icon_margin_horizontal" - android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:clickable="false" - android:layout_marginBottom="20dp" - android:textAppearance="@style/ListItemTextStyle" - android:layout_toEndOf="@id/quick_start_toggle" - android:layout_above="@id/tor_bootstrap_connect_button" - android:textColor="#FFBBBBBB" - android:text="@string/tor_bootstrap_quick_start_disabled" - android:lines="3" - android:textSize="18sp" /> - <Button android:id="@+id/tor_bootstrap_connect_button" android:layout_width="wrap_content" ===================================== fenix/app/src/main/res/layout/tor_network_settings_beta_connection_features.xml ===================================== @@ -84,7 +84,6 @@ android:background="?android:attr/selectableItemBackground" android:button="@null" android:drawablePadding="@dimen/radio_button_preference_drawable_padding" - android:enabled="false" android:paddingStart="@dimen/radio_button_preference_horizontal" android:paddingTop="@dimen/radio_button_preference_vertical" android:paddingEnd="@dimen/radio_button_preference_horizontal" ===================================== fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -277,6 +277,31 @@ app:popExitAnim="@anim/slide_out_right" /> </fragment> + <fragment + android:id="@+id/torConnectionAssistFragment" + android:name="org.mozilla.fenix.tor.TorConnectionAssistFragment" + tools:layout="@layout/fragment_home"> + <action + android:id="@+id/action_home" + app:destination="@id/homeFragment" + app:popUpTo="@id/torConnectionAssistFragment" + app:popUpToInclusive="true" /> + <action + android:id="@+id/action_torConnectionAssistFragment_to_SettingsFragment" + app:destination="@id/settingsFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_torConnectionAssistFragment_to_TorNetworkSettings" + app:destination="@id/torNetworkSettingsFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> + </fragment> + <dialog android:id="@+id/homeOnboardingDialogFragment" android:name="org.mozilla.fenix.onboarding.HomeOnboardingDialogFragment" /> @@ -769,6 +794,13 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_TorConnectionAssistFragment" + app:destination="@id/torConnectionAssistFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> </fragment> <dialog android:id="@+id/profilerStartDialogFragment" ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -340,4 +340,9 @@  <color name="material_scrim_color">#52000000</color> + +  + <color name="connect_button_purple">#9059FF</color> + <color name="configure_connection_button_white">#E1E0E7</color> + </resources> ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -75,4 +75,73 @@  <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string> +  + <string name="connection_assist_tor_connect_title">Connect to Tor</string> +  + <string name="connection_assist_always_connect_automatically_toggle_description">Always connect automatically</string> +  + <string name="connection_assist_configure_connection_button">Configure connection…</string> + +  + <string name="connection_assist_connecting_title">Establishing a connection…</string> + +  + <string name="connection_assist_internet_error_title">We can’t reach the internet</string> +  + <string name="connection_assist_internet_error_description">This could be due to a connection issue rather than Tor being blocked. Check your internet connection, proxy, and firewall settings before trying again. %1$s</string> +  + <string name="connection_assist_internet_error_learn_more">Learn more</string> +  + <string name="connection_assist_internet_error_try_again">Try again</string> + +  + <string name="connection_assist_trying_again_waiting_title">Trying again…</string> + +  + <string name="connection_assist_cant_connect_to_tor_title">We can’t connect to Tor directly</string> +  + <string name="connection_assist_try_a_bridge_description">Try connecting via a bridge instead. By providing your location, we can look up the bridge that’s most likely to unblock the internet in your country or region. %1$s</string> +  + <string name="connection_assist_unblock_the_internet_in_country_or_region">Unblock the internet in:</string> +  + <string name="connection_assist_share_my_location_country_or_region">Share my location</string> +  + <string name="connection_assist_try_a_bridge_button">Try a bridge</string> + +  + <string name="connection_assist_try_a_bridge_learn_more_description1">Tor Browser will need to establish a brief non-Tor connection to determine your location and look up a bridge. If you don’t want to do that, you can %1$s instead.</string> +  + <string name="connection_assist_choose_a_bridge_manually_link">choose a bridge manually</string> +  + <string name="connection_assist_try_a_bridge_learn_more_error_code">Error code: %s</string> + +  + <string name="connection_assist_trying_a_bridge_title">Trying a bridge…</string> + +  + <string name="connection_assist_location_error_title">We couldn’t find your location</string> +  + <string name="connection_assist_location_error_description" translatable="false">%1$s %2$s %3$s</string> + <string name="connection_assist_find_bridge_location_description">To find a bridge that can unblock your internet, we need to know where you’re connecting from.</string> + <string name="connection_assist_select_country_try_again">Select your country or region and try again.</string> +  + <string name="connection_assist_location_error_last_try_description">%1$s %2$s %3$s</string> + <string name="connection_assist_check_location_settings_try_again">Please check your location settings are correct and try again.</string> + + <string name="connection_assist_location_error_learn_more_link">Learn more</string> + +  + <string name="connection_assist_location_check_title">We’re still having trouble connecting</string> + +  + <string name="connection_assist_last_try_title">Trying one more time…</string> + +  + <string name="connection_assist_final_error_title">We weren’t able to connect automatically</string> +  + <string name="connection_assist_final_error_description1">Despite our best efforts, we weren’t able to connect to Tor. We recommend %1$s and adding a bridge manually instead. %2$s</string> +  + <string name="connection_assist_final_error_troubleshoot_connection_link">troubleshooting your connection</string> +  + <string name="connection_assist_final_error_learn_more_link">Learn more</string> </resources> ===================================== fenix/tools/tba-fetch-deps.sh ===================================== @@ -14,7 +14,7 @@ fi onion_proxy_library="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-onion-proxy-library/"tor-onion-proxy-library-* | head -1)" if [ -z "$onion_proxy_library" ]; then - echo "Cannot find Tor Onoin Proxy library artifacts!" + echo "Cannot find Tor Onion Proxy library artifacts!" exit 2 fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/16… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/16… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 21 Feb '24

21 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 11ce0365 by Henry Wilkes at 2024-02-21T18:56:18+01:00 fixup! Base Browser strings Bug 42423: Add a base-browser Fluent file that is not passed on to translators. - - - - - 2 changed files: - + browser/locales-preview/base-browser-no-translate.ftl - browser/locales/jar.mn Changes: ===================================== browser/locales-preview/base-browser-no-translate.ftl ===================================== @@ -0,0 +1 @@ +# base-browser strings that should *not* be sent to translators on Weblate. ===================================== browser/locales/jar.mn ===================================== @@ -14,6 +14,7 @@ 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: View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/11c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/11c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 21 Feb '24

21 Feb '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 158a87d9 by Henry Wilkes at 2024-02-21T18:55:55+01:00 fixup! Base Browser strings Bug 42423: Add a base-browser Fluent file that is not passed on to translators. - - - - - 2 changed files: - + browser/locales-preview/base-browser-no-translate.ftl - browser/locales/jar.mn Changes: ===================================== browser/locales-preview/base-browser-no-translate.ftl ===================================== @@ -0,0 +1 @@ +# base-browser strings that should *not* be sent to translators on Weblate. ===================================== browser/locales/jar.mn ===================================== @@ -14,6 +14,7 @@ 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: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/158a87d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/158a87d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 3 commits: fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 21 Feb '24

21 Feb '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4044ac1c by Henry Wilkes at 2024-02-21T16:32:16+00:00 fixup! Base Browser strings Bug 42423: Add a base-browser Fluent file that is not passed on to translators. - - - - - 73edce4c by Henry Wilkes at 2024-02-21T16:32:17+00:00 fixup! Tor Browser strings Bug 42423: Add a tor-browser Fluent file that is not passed on to translators. - - - - - 4b5aa8fa by Henry Wilkes at 2024-02-21T16:32:17+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42423: Move temporary Lox invite strings to new file. - - - - - 5 changed files: - browser/components/torpreferences/content/loxInviteDialog.xhtml - + browser/locales-preview/base-browser-no-translate.ftl - + browser/locales-preview/tor-browser-no-translate.ftl - browser/locales/en-US/browser/tor-browser.ftl - browser/locales/jar.mn Changes: ===================================== browser/components/torpreferences/content/loxInviteDialog.xhtml ===================================== @@ -20,6 +20,10 @@ <dialog id="lox-invite-dialog" buttons="accept"> <linkset> <html:link rel="localization" href="browser/tor-browser.ftl" /> + <html:link + rel="localization" + href="preview/tor-browser-no-translate.ftl" + /> </linkset> <script src="chrome://browser/content/torpreferences/loxInviteDialog.js" /> ===================================== browser/locales-preview/base-browser-no-translate.ftl ===================================== @@ -0,0 +1 @@ +# base-browser strings that should *not* be sent to translators on Weblate. ===================================== browser/locales-preview/tor-browser-no-translate.ftl ===================================== @@ -0,0 +1,16 @@ +# tor-browser strings that should *not* be sent to translators on Weblate. + +## Bridge pass invite dialog. +## Temporary until tor-browser#42385 + +lox-invite-dialog-title = + .title = Bridge pass invites +lox-invite-dialog-description = You can ask the bridge bot to create a new invite, which you can share with a trusted contact to give them their own bridge pass. Each invite can only be redeemed once, but you will unlock access to more invites over time. +lox-invite-dialog-request-button = Request new invite +lox-invite-dialog-connecting = Connecting to bridge pass server… +lox-invite-dialog-no-server-error = Unable to connect to bridge pass server. +lox-invite-dialog-generic-invite-error = Failed to create a new invite. +lox-invite-dialog-invites-label = Created invites: +lox-invite-dialog-menu-item-copy-invite = + .label = Copy invite + .accesskey = C ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -298,17 +298,3 @@ user-provide-bridge-dialog-result-invite = The following bridges were shared wit user-provide-bridge-dialog-result-addresses = The following bridges were entered by you. user-provide-bridge-dialog-next-button = .label = Next - -## Bridge pass invite dialog. Temporary. - -lox-invite-dialog-title = - .title = Bridge pass invites -lox-invite-dialog-description = You can ask the bridge bot to create a new invite, which you can share with a trusted contact to give them their own bridge pass. Each invite can only be redeemed once, but you will unlock access to more invites over time. -lox-invite-dialog-request-button = Request new invite -lox-invite-dialog-connecting = Connecting to bridge pass server… -lox-invite-dialog-no-server-error = Unable to connect to bridge pass server. -lox-invite-dialog-generic-invite-error = Failed to create a new invite. -lox-invite-dialog-invites-label = Created invites: -lox-invite-dialog-menu-item-copy-invite = - .label = Copy invite - .accesskey = C ===================================== browser/locales/jar.mn ===================================== @@ -14,6 +14,8 @@ 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) + preview/tor-browser-no-translate.ftl (../locales-preview/tor-browser-no-translate.ftl) browser (%browser/**/*.ftl) @AB_CD@.jar: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bdfc4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bdfc4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update Mullvad and Tor Browser Release Prep issue templates
by richard (＠richard) 21 Feb '24

21 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f1811496 by Richard Pospesel at 2024-02-21T11:55:05+00:00 Update Mullvad and Tor Browser Release Prep issue templates - - - - - 4 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 Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -27,172 +27,178 @@ </details> **NOTE** It is assumed that the `tor-browser` alpha rebase and security backport tasks have been completed + **NOTE** This can/is often done in conjunction with the equivalent Tor Browser release prep issue <details> <summary>Building</summary> - ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git - 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/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 - - [ ] Update build configs - - [ ] Update `projects/firefox/config` - - [ ] `browser_build` : update to match `mullvad-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-alpha` to get updated hashes - - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch - - [ ] Update common build configs - - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/ - - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases - - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Update `ChangeLog-MB.txt` - - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches - - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - - The first time you run this script you will need to generate an access token; the script will guide you - - `$updateArgs` should be these arguments, depending on what you actually updated: - - [ ] `--firefox` - - [ ] `--no-script` - - [ ] `--ublock` - - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` - - `--date $date` is optional, if omitted it will be the date on which you run the command - - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output - - [ ] Open MR with above changes, using the template for release preparations - - [ ] Merge - - [ ] Sign+Tag - - **NOTE** this must be done by one of: - - boklm - - dan - - ma1 - - pierov - - richard - - [ ] Run: `make mullvadbrowser-signtag-alpha` - - [ ] Push tag to `upstream` - - [ ] Build the tag on at least one of: - - Run `make mullvadbrowser-alpha && make mullvadbrowser-incrementals-alpha` +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git +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/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 +- [ ] Update build configs + - [ ] Update `projects/firefox/config` + - [ ] `browser_build` : update to match `mullvad-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-alpha` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch +- [ ] Update common build configs + - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript + - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/ + - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for Mullvad Browser Extension updates here : https://github.com/mullvad/browser-extension/releases + - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` +- [ ] Update `ChangeLog-MB.txt` + - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches + - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones + - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - Make sure you have `requests` installed (e.g., `apt install python3-requests`) + - The first time you run this script you will need to generate an access token; the script will guide you + - `$updateArgs` should be these arguments, depending on what you actually updated: + - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) + - [ ] `--no-script` + - [ ] `--ublock` + - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` + - `--date $date` is optional, if omitted it will be the date on which you run the command + - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output +- [ ] Open MR with above changes, using the template for release preparations +- [ ] Merge +- [ ] Sign+Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make mullvadbrowser-signtag-alpha` + - [ ] Push tag to `upstream` +- [ ] Build the tag: + - Run `make mullvadbrowser-alpha && make mullvadbrowser-incrementals-alpha` on: - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - **NOTE** this requires a devmole authentication token - Run `make mullvadbrowser-kick-devmole-build` - - [ ] Ensure builders have matching builds +- [ ] Ensure builders have matching builds </details> <details> <summary>Signing</summary> - ### signing - - [ ] Assign this issue to the signer, one of: - - boklm - - richard - - [ ] On `$(STAGING_SERVER)`, ensure updated: - - [ ] `tor-browser-build/tools/signing/set-config.hosts` - - `ssh_host_builder` : ssh hostname of machine with unsigned builds - - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - - `ssh_host_linux_signer` : ssh hostname of linux signing machine - - [ ] `tor-browser-build/tools/signing/set-config.rcodesign-appstoreconnect` - - `appstoreconnect_api_key_path` : path to json file containing appstoreconnect api key infos - - [ ] `set-config.update-responses` - - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git` - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases - - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 - - [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.mullvadbrowser` - - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - - [ ] Update `staticiforme.torproject.org`: - - From `screen` session on `staticiforme.torproject.org`: - - [ ] Static update components : `static-update-component dist.torproject.org` - - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser` - - [ ] Static update components (again) : `static-update-component dist.torproject.org` +### release signing +- [ ] Assign this issue to the signer, one of: + - boklm + - richard +- [ ] On `$(STAGING_SERVER)`, ensure updated: + - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(MULLVAD_BROWSER_VERSION)-$(MULLVAD_BROWSER_BUILD_N) && git checkout tbb-$(MULLVAD_BROWSER_VERSION)-$(MULLVAD_BROWSER_BUILD_N)` + - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - `ssh_host_builder` : ssh hostname of machine with unsigned builds + - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) + - `ssh_host_linux_signer` : ssh hostname of linux signing machine + - [ ] `tor-browser-build/tools/signing/set-config.rcodesign-appstoreconnect` + - `appstoreconnect_api_key_path` : path to json file containing appstoreconnect api key infos + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git` + - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` + - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) + - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) + - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.mullvadbrowser` +- **NOTE**: at this point the signed binaries should have been copied to `staticiforme` +- [ ] Update `staticiforme.torproject.org`: + - From `screen` session on `staticiforme.torproject.org`: + - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser` + - [ ] Static update components (again) : `static-update-component dist.torproject.org` </details> <details> <summary>Publishing</summary> - ### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/ - - [ ] Assign this issue to someone with mullvad commit access, one of: +### mullvad-browser (GitHub): https://github.com/mullvad/mullvad-browser/ +- [ ] Assign this issue to someone with mullvad commit access, one of: - richard - - [ ] Push this release's associated `mullvad-browser.git` branch to github - - [ ] Push this release's associated tags to github: - - [ ] Firefox ESR tag - - **example** : `FIREFOX_102_12_0esr_BUILD1,` - - [ ] `base-browser` tag - - **example** : `base-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` tag - - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1` - - [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: - - **Tag**: `$(MULLVAD_BROWSER_VERSION)` - - **example** : `12.5a7` - - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)` - - **example** : `102.12.0esr-based 12.5a7` - - [ ] Push tag to github - - ### email - - [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net - <details> - <summary>email template</summary> - - Subject: - New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) - - Body: - signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) - - update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) - - changelog: - ... - - </details> +- [ ] Push this release's associated `mullvad-browser.git` branch to github +- [ ] Push this release's associated tags to github: + - [ ] Firefox ESR tag + - **example** : `FIREFOX_102_12_0esr_BUILD1` + - [ ] `base-browser` tag + - **example** : `base-browser-102.12.0esr-12.0-1-build1` + - [ ] `mullvad-browser` tag + - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1` +- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: + - **Tag**: `$(MULLVAD_BROWSER_VERSION)` + - **example** : `12.5a7` + - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)` + - **example** : `102.12.0esr-based 12.5a7` + - [ ] Push tag to github + +### email +- [ ] **(Once branch+tags pushed to GitHub)** Email Mullvad with release information: + - [ ] support alias: support(a)mullvadvpn.net + - [ ] Rui: rui(a)mullvad.net + - **Subject** + ``` + New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) + ``` + - **Body** + ``` + Hello, + + Branch+Tags have been pushed to Mullvad's GitHub repo. + + - signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) + - update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) + + changelog: + ... + ``` + </details> <details> <summary>Downstream</summary> - ### notify packagers - - - [ ] **(Optional, Once Mullvad Updates their Github Releases Page)** Email downstream consumers: - - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of - <details> - <summary>email template</summary> - - Hello! - - Mullvad-Browser $(MULLVAD_BROWSER_VERSION) packages are available, so you should all update your respective downstream packages. - - Release builds can be found here: - - - https://github.com/mullvad/mullvad-browser/releases/tag/$(MULLVAD_BROWSER_V… - - </details> - - - flathub package maintainer: proletarius101(a)protonmail.com - - arch package maintainer: bootctl(a)gmail.com - - nixOS package maintainer: dev(a)felschr.com +### notify packagers +These steps depend on Mullvad having updated their [GitHub Releases](https://github.com/mullvad/mullvad-browser/releases/) page with the latest release +- [ ] **(Optional)** Email downstream consumers: + - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of + - [ ] flathub package maintainer: proletarius101(a)protonmail.com + - [ ] arch package maintainer: bootctl(a)gmail.com + - [ ] nixOS package maintainer: dev(a)felschr.com + - **Subject** + ``` + Mullvad Browser $(MULLVAD_BROWSER_VERSION) released + ``` + - **Body** + ``` + Hello! + + This is a major alpha release which may require changes in your respective downstream packages once it stabilises. + + The latest alpha builds can be found here: + + - https://github.com/mullvad/mullvad-browser/releases?q=prerelease%3Atrue + ``` </details> ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -28,6 +28,8 @@ **NOTE** It is assumed that the `tor-browser` stable rebase and security backport tasks have been completed +**NOTE** This can/is often done in conjunction with the equivalent Tor Browser release prep issue + <details> <summary>Building</summary> @@ -38,6 +40,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` - [ ] `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 - [ ] Update build configs - [ ] Update `projects/firefox/config` @@ -46,7 +49,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] Update `projects/translation/config`: - [ ] run `make list_translation_updates-release` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch - [ ] Update common build configs - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` @@ -56,7 +59,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config` - [ ] `URL` - [ ] `sha256sum` - - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases + - [ ] Check for Mullvad Browser Extension updates here : https://github.com/mullvad/browser-extension/releases - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config` - [ ] `URL` - [ ] `sha256sum` @@ -67,39 +70,43 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - `$updateArgs` should be these arguments, depending on what you actually updated: - - [ ] `--firefox` + - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) - [ ] `--no-script` - [ ] `--ublock` - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output - - [ ] Open MR with above changes, using the template for release preparations - - [ ] Merge - - [ ] Sign+Tag - - **NOTE** this must be done by one of: - - boklm - - dan - - ma1 - - pierov - - richard - - [ ] Run: `make mullvadbrowser-signtag-release` - - [ ] Push tag to `upstream` - - [ ] Build on at least one of: - - Run `make mullvadbrowser-release && make mullvadbrowser-incrementals-release` +- [ ] Open MR with above changes, using the template for release preparations +- [ ] Merge +- [ ] Sign+Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make mullvadbrowser-signtag-release` + - [ ] Push tag to `upstream` +- [ ] Build the tag: + - Run `make mullvadbrowser-release && make mullvadbrowser-incrementals-release` - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - **NOTE** this requires a devmole authentication token - Run `make mullvadbrowser-kick-devmole-build` - - [ ] Ensure builders have matching builds +- [ ] Ensure builders have matching builds </details> <details> <summary>Signing</summary> -### signing +### release signing +- [ ] Assign this issue to the signer, one of: + - boklm + - richard - [ ] On `$(STAGING_SERVER)`, ensure updated: + - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(MULLVAD_BROWSER_VERSION)-$(MULLVAD_BROWSER_BUILD_N) && git checkout tbb-$(MULLVAD_BROWSER_VERSION)-$(MULLVAD_BROWSER_BUILD_N)` - [ ] `tor-browser-build/tools/signing/set-config.hosts` - `ssh_host_builder` : ssh hostname of machine with unsigned builds - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) @@ -113,13 +120,12 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.mullvadbrowser` +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.mullvadbrowser` - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: - - [ ] Static update components : `static-update-component dist.torproject.org` - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser` - [ ] Static update components (again) : `static-update-component dist.torproject.org` @@ -128,30 +134,13 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU <details> <summary>Publishing</summary> -### email - -- [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net - <details> - <summary>email template</summary> - - Subject: - New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) - - Body: - signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) - - update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) - - changelog: - ... - - </details> - -### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/ +### mullvad-browser (GitHub): https://github.com/mullvad/mullvad-browser/ +- [ ] Assign this issue to someone with mullvad commit access, one of: + - richard - [ ] Push this release's associated `mullvad-browser.git` branch to github - [ ] Push this release's associated tags to github: - [ ] Firefox ESR tag - - **example** : `FIREFOX_102_12_0esr_BUILD1,` + - **example** : `FIREFOX_102_12_0esr_BUILD1` - [ ] `base-browser` tag - **example** : `base-browser-102.12.0esr-12.0-1-build1` - [ ] `mullvad-browser` tag @@ -163,32 +152,59 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - **example** : `102.12.0esr-based 12.0.7` - [ ] Push tag to github +### email +- [ ] **(Once branch+tags pushed to GitHub)** Email Mullvad with release information: + - [ ] support alias: support(a)mullvadvpn.net + - [ ] Rui: rui(a)mullvad.net + - **Subject** + ``` + New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) + ``` + - **Body** + ``` + Hello, + + Branch+Tags have been pushed to Mullvad's GitHub repo. + + - signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) + - update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) + + changelog: + ... + ``` + </details> <details> <summary>Downstream</summary> ### notify packagers - -- [ ] **(Once Mullvad Updates their Github Releases Page)** Email downstream consumers: - <details> - <summary>email template</summary> - - ... - - ... - - </details> - +These steps depend on Mullvad having updated their [GitHub Releases](https://github.com/mullvad/mullvad-browser/releases/) page with the latest release +- [ ] Email downstream consumers: - [ ] flathub package maintainer: proletarius101(a)protonmail.com - [ ] arch package maintainer: bootctl(a)gmail.com - [ ] nixOS package maintainer: dev(a)felschr.com + - **Subject** + ``` + Mullvad Browser $(MULLVAD_BROWSER_VERSION) released + ``` + - **Body** + ``` + Hello! -### merge requests + Mullvad-Browser packages are available, so you should update your respective downstream packages. + + The latest release builds can be found here: -- [ ] homebrew: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/mullvad-browser… - - **NOTE**: should just need to update the version to latest + - https://github.com/mullvad/mullvad-browser/releases?q=prerelease%3Afalse + ``` + +### merge requests +- [ ] homebrew: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/m/mullvad-brows… + - **NOTE**: should just need to update `version` and `sha256` to latest </details> -/label ~"Release Prep" ~"Sponsor 131" +/label ~"Release Prep" +/label ~"Sponsor 131" + ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -32,197 +32,176 @@ <details> <summary>Building</summary> - ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git - 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)` - - [ ] ***(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 - - [ ] Update Desktop-specific build configs - - [ ] Update `projects/firefox/config` - - [ ] `browser_build` : update to match `tor-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-alpha` to get updated hashes - - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch - - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - - [ ] Update Android-specific build configs - - [ ] Update `projects/geckoview/config` - - [ ] `browser_build` : update to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] ***(Optional)*** Update `projects/tor-android-service/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch - - [ ] ***(Optional)*** Update `projects/application-services/config`: - **NOTE** we don't currently have any of our own patches for this project - - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` - - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - - [ ] `browser_branch` : update to match alpha `firefox-android` build tag - - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` - - [ ] Update common build configs - - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ - - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config` - - [ ] `version` : update to next 3.0.X version - - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball - - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases - - [ ] **(Optional)** If new tag available, update `projects/zlib/config` - - [ ] `version` : update to next release tag - - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags - - [ ] ***(Optional)*** Update `projects/tor/config` - - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure) - - [ ] Check for go updates here : https://golang.org/dl - - **NOTE** : Tor Browser Alpha uses the latest Stable major series go version - - [ ] ***(Optional)*** Update `projects/go/config` - - [ ] `version` : update go version - - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) - - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py` - - [ ] ***(Optional)*** If new version is available: - - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to `tb-build-02.torproject.org` - - [ ] Deploy to `tb-builder`'s `public_html` directory: - - `sudo -u tb-builder cp manual_$PIPELINEID.zip ~/../tb-builder/public_html/.` - - [ ] Update `projects/manual/config`: - - [ ] Change the `version` to `$PIPELINEID` - - [ ] Update `sha256sum` in the `input_files` section - - [ ] Update `ChangeLog-TBB.txt` - - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches - - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` - - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - - The first time you run this script you will need to generate an access token; the script will guide you - - `$updateArgs` should be these arguments, depending on what you actually updated: - - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) - - [ ] `--tor` - - [ ] `--no-script` - - [ ] `--openssl` - - [ ] `--zlib` - - [ ] `--go` - - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` - - `--date $date` is optional, if omitted it will be the date on which you run the command - - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output - - [ ] Open MR with above changes, using the template for release preparations - - [ ] Merge - - [ ] Sign+Tag - - **NOTE** this must be done by one of: - - boklm - - dan - - ma1 - - pierov - - richard - - [ ] Run: `make torbrowser-signtag-alpha` - - [ ] Push tag to `upstream` - - [ ] Build on at least one of: - - Run `make torbrowser-alpha && make torbrowser-incrementals-alpha` +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git +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)` + - [ ] ***(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 +- [ ] Update Desktop-specific build configs + - [ ] Update `projects/firefox/config` + - [ ] `browser_build` : update to match `tor-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased +- [ ] Update Android-specific build configs + - [ ] Update `projects/geckoview/config` + - [ ] `browser_build` : update to match `tor-browser` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] ***(Optional)*** Update `projects/tor-android-service/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch + - [ ] ***(Optional)*** Update `projects/application-services/config`: + **NOTE** we don't currently have any of our own patches for this project + - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` + - [ ] ***(Optional)*** Update `projects/firefox-android/config`: + - [ ] `fenix_version` : update to match alpha `firefox-android` build tag + - [ ] `browser_branch` : update to match alpha `firefox-android` build tag + - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): + - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` +- [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-alpha` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch +- [ ] Update common build configs + - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript + - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ + - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config` + - [ ] `version` : update to next 3.0.X version + - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball + - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases + - [ ] **(Optional)** If new tag available, update `projects/zlib/config` + - [ ] `version` : update to next release tag + - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags + - [ ] ***(Optional)*** Update `projects/tor/config` + - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure) + - [ ] Check for go updates here : https://go.dev/dl + - **NOTE** : In general, Tor Browser Alpha uses the latest Stable major series Go version, but there are sometimes exceptions. Check with the anti-censorship team before doing a major version update in case there is incompatibilities. + - [ ] ***(Optional)*** Update `projects/go/config` + - [ ] `version` : update go version + - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) + - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py` + - [ ] ***(Optional)*** If new version is available: + - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to `tb-build-02.torproject.org` + - [ ] Deploy to `tb-builder`'s `public_html` directory: + - `sudo -u tb-builder cp manual_$PIPELINEID.zip ~tb-builder/public_html/.` + - [ ] Update `projects/manual/config`: + - [ ] Change the `version` to `$PIPELINEID` + - [ ] Update `sha256sum` in the `input_files` section +- [ ] Update `ChangeLog-TBB.txt` + - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches + - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones + - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs` + - Make sure you have `requests` installed (e.g., `apt install python3-requests`) + - The first time you run this script you will need to generate an access token; the script will guide you + - `$updateArgs` should be these arguments, depending on what you actually updated: + - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case) + - [ ] `--tor` + - [ ] `--no-script` + - [ ] `--openssl` + - [ ] `--zlib` + - [ ] `--go` + - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` + - `--date $date` is optional, if omitted it will be the date on which you run the command + - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output +- [ ] Open MR with above changes, using the template for release preparations +- [ ] Merge +- [ ] Sign+Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make torbrowser-signtag-alpha` + - [ ] Push tag to `upstream` +- [ ] Build the tag: + - Run `make torbrowser-alpha && make torbrowser-incrementals-alpha` - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - **NOTE** this requires a devmole authentication token - Run `make torbrowser-kick-devmole-build` - - [ ] Ensure builders have matching builds +- [ ] Ensure builders have matching builds </details> <details> <summary>Communications</summary> - ### notify stakeholders - - - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - <details> - <summary>email template</summary> - - Subject: - Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) - - Body: - Hello All, - - Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: - - - https://tb-build-05.torproject.org/~$(BUILDER)/builds/alpha/unsigned/$(TOR_… - - The full changelog can be found here: - - - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$(TB… - - </details> - - - ***(Optional)*** Additional information: - - [ ] Note any new functionality which needs testing - - [ ] Link to any known issues - - [ ] ***(Optional, only around build/packaging changes)*** Email packagers: - - Recipients: - - Tails dev mailing list: tails-dev(a)boum.org - - Guardian Project: nathan(a)guardianproject.info - - torbrowser-launcher: micah(a)micahflee.com - - FreeBSD port: freebsd(a)sysctl.cz  - - OpenBSD port: caspar(a)schutijser.com  - - [ ] Note any changes which may affect packaging/downstream integration - - [ ] Email external partners: - - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com - - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs - - ***(Optional, after ESR migration)*** Startpage: admin(a)startpage.com - - **NOTE** : Startpage also needs the updated user-agent string for better experience on their onion service sites. +### notify stakeholders +- [ ] **(Once builds confirmed matching)** Email tor-qa mailing list with release information + - [ ] tor-qa: tor-qa(a)lists.torproject.org + - **Subject** + ``` + Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) + ``` + - **Body** + ``` + Hello, + + Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: + + - https://tb-build-02.torproject.org/~$(BUILDER)/builds/alpha/unsigned/$(TOR_… + + The full changelog can be found here: + + - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$(TB… + ``` +- [ ] ***(Optional, only around build/packaging changes)*** Email packagers: + - [ ] Tails dev mailing list: tails-dev(a)boum.org + - [ ] Guardian Project: nathan(a)guardianproject.info + - [ ] FreeBSD port: freebsd(a)sysctl.cz  + - [ ] OpenBSD port: caspar(a)schutijser.com  + - [ ] Note any changes which may affect packaging/downstream integration +- [ ] ***(Optional, after ESR migration)*** Email external partners: + - [ ] Cloudflare: ask-research(a)cloudflare.com + - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs + - [ ] Startpage: admin(a)startpage.com + - **NOTE** : Startpage also needs the updated user-agent string for better experience on their onion service sites. </details> <details> <summary>Signing</summary> - ### signing - - **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long - - [ ] Assign this issue to the signer, one of: - - boklm - - richard - - [ ] On `$(STAGING_SERVER)`, ensure updated: - - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)` - - [ ] `tor-browser-build/tools/signing/set-config.hosts` - - `ssh_host_builder` : ssh hostname of machine with unsigned builds - - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - - `ssh_host_linux_signer` : ssh hostname of linux signing machine - - [ ] `tor-browser-build/tools/signing/set-config.rcodesign-appstoreconnect` - - `appstoreconnect_api_key_path` : path to json file containing appstoreconnect api key infos - - [ ] `set-config.update-responses` - - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases - - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 - - [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.torbrowser` - - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - - [ ] Update `staticiforme.torproject.org`: - - From `screen` session on `staticiforme.torproject.org`: - - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` - - [ ] Remove old release data from following places: - - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc) - - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Publish APKs to Google Play: - - Log into https://play.google.com/apps/publish - - Select `Tor Browser (Alpha)` app - - Navigate to `Release > Production` and click `Create new release` button: - - Upload the `tor-browser-android-*.apk` APKs - - Update Release Name to Tor Browser version number - - Update Release Notes - - Next to 'Release notes', click `Copy from a previous release` - - Edit blog post url to point to most recent blog post - - Save, review, and configure rollout percentage - - [ ] 25% rollout when publishing a scheduled update - - [ ] 100% rollout when publishing a security-driven release - - [ ] Update rollout percentage to 100% after confirmed no major issues +### release signing +- **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long +- [ ] Assign this issue to the signer, one of: + - boklm + - richard +- [ ] On `$(STAGING_SERVER)`, ensure updated: + - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)` + - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - `ssh_host_builder` : ssh hostname of machine with unsigned builds + - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) + - `ssh_host_linux_signer` : ssh hostname of linux signing machine + - [ ] `tor-browser-build/tools/signing/set-config.rcodesign-appstoreconnect` + - `appstoreconnect_api_key_path` : path to json file containing appstoreconnect api key infos + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` + - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` + - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) + - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) + - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.torbrowser` +- **NOTE**: at this point the signed binaries should have been copied to `staticiforme` +- [ ] Update `staticiforme.torproject.org`: + - From `screen` session on `staticiforme.torproject.org`: + - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` + - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` + - [ ] Remove old release data from following places: + - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc) + - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` + - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` + - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` </details> @@ -262,55 +241,58 @@ popd <details> <summary>Publishing</summary> - ### website: https://gitlab.torproject.org/tpo/web/tpo.git - - [ ] `databags/versions.ini` : Update the downloads versions - - `torbrowser-stable/version` : sort of a catch-all for latest stable version - - `torbrowser-alpha/version` : sort of a catch-all for latest stable version - - `torbrowser-*-stable/version` : platform-specific stable versions - - `torbrowser-*-alpha/version` : platform-specific alpha versions - - `tor-stable`,`tor-alpha` : set by tor devs, do not touch - - [ ] Push to origin as new branch, open 'Draft :' MR - - [ ] Remove `Draft:` from MR once signed-packages are uploaded - - [ ] Merge - - [ ] Publish after CI passes and builds are published - - ### blog: https://gitlab.torproject.org/tpo/web/blog.git - - [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : - - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) - - [ ] Update Tor Browser version numbers - - [ ] Note any ESR rebase - - [ ] Link to any Firefox security updates from ESR upgrade - - [ ] Link to any Android-specific security backports - - [ ] Note any updates to : - - tor - - OpenSSL - - NoScript - - [ ] Convert ChangeLog-TBB.txt to markdown format used here by : - - `tor-browser-build/tools/changelog-format-blog-post` - - [ ] Push to origin as new branch, open `Draft:` MR - - [ ] Remove `Draft:` from MR once signed-packages are uploaded - - [ ] Merge - - [ ] Publish after CI passes and website has been updated - - ### tor-announce mailing list - - [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org - <details> - <summary>email template</summary> - - Subject: - New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) - - Body: - Hi everyone, - - Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: - - - $(BLOG_POST_URL) - - </details> - - - **(Optional)** Additional information: - - [ ] Link to any known issues +### Google Play: https://play.google.com/apps/publish +- [ ] Publish APKs to Google Play: + - Select `Tor Browser (Alpha)` app + - Navigate to `Release > Production` and click `Create new release` button: + - Upload the `tor-browser-android-*.apk` APKs + - Update Release Name to Tor Browser version number + - Update Release Notes + - Next to 'Release notes', click `Copy from a previous release` + - Edit blog post url to point to most recent blog post + - Save, review, and configure rollout percentage + - [ ] 25% rollout when publishing a scheduled update + - [ ] 100% rollout when publishing a security-driven release + - [ ] Update rollout percentage to 100% after confirmed no major issues + +### website: https://gitlab.torproject.org/tpo/web/tpo.git +- [ ] `databags/versions.ini` : Update the downloads versions + - `torbrowser-stable/version` : sort of a catch-all for latest stable version + - `torbrowser-alpha/version` : sort of a catch-all for latest stable version + - `torbrowser-*-stable/version` : platform-specific stable versions + - `torbrowser-*-alpha/version` : platform-specific alpha versions + - `tor-stable`,`tor-alpha` : set by tor devs, do not touch +- [ ] Push to origin as new branch, open 'Draft :' MR +- [ ] Remove `Draft:` from MR once signed-packages are accessible on https://dist.torproject.org +- [ ] Merge +- [ ] Publish after CI passes and builds are published + +### blog: https://gitlab.torproject.org/tpo/web/blog.git +- [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) + - [ ] Note any ESR update + - [ ] Note any updates to dependencies (OpenSSL, zlib, NoScript, tor, etc) + - [ ] Thank any users which have contributed patches + - [ ] **(Optional)** Draft any additional sections for new features which need testing, known issues, etc +- [ ] Push to origin as new branch, open `Draft:` MR +- [ ] Merge once signed-packages are accessible on https://dist.torproject.org +- [ ] Publish after CI passes and website has been updated + +### tor-announce mailing list +- [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org + - **Subject** + ``` + New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) + ``` + - **Body** + ``` + Hi everyone, + + Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: + - $(BLOG_POST_URL) + + Changelog: + # paste changleog as quote here + ``` </details> ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -27,29 +27,24 @@ </details> **NOTE** It is assumed that the `tor-browser` stable rebase and security backport tasks have been completed +**NOTE** This can/is often done in conjunction with the equivalent Mullvad Browser release prep issue <details> <summary>Building</summary> ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git -Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches +Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches. - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - [ ] ***(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 - [ ] Update Desktop-specific build configs - [ ] Update `projects/firefox/config` - [ ] `browser_build` : update to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-release` to get updated hashes - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-alpha` to get updated hashes - - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch - - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - [ ] Update Android-specific build configs - [ ] Update `projects/geckoview/config` - [ ] `browser_build` : update to match `tor-browser` tag @@ -60,27 +55,32 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE **NOTE** we don't currently have any of our own patches for this project - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - - [ ] `browser_branch` : update to match alpha `firefox-android` build tag + - [ ] `fenix_version` : update to match alpha `firefox-android` build tag + - [ ] `browser_branch` : update to match alpha `firefox-android` build tag - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` +- [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-release` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - [ ] Update common build configs - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - [ ] `URL` - [ ] `sha256sum` - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ - - [ ] ***(Optional)*** If new 1.X.Y version available, update `projects/openssl/config` - - [ ] `version` : update to next 1.X.Y version + - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config` + - [ ] `version` : update to next 3.0.X version - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases - [ ] **(Optional)** If new tag available, update `projects/zlib/config` - [ ] `version` : update to next release tag - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags - - [ ] ***(Optional)*** Update `projects/tor/config` + - [ ] ***(Optional)*** Update `projects/tor/config` - [ ] `version` : update to latest non `-alpha` tag (ping dgoulet or ahf if unsure) - [ ] Check for go updates here : https://go.dev/dl - - **NOTE** : Tor Browser Stable uses the latest of the *previous* Stable major series go version (apart from the transition phase from Tor Browser Alpha to Stable, in which case Tor Browser Stable may use the latest major series go version) + - **NOTE** : In general, Tor Browser Stable uses the latest of the *previous* Stable major series Go version, but there are sometimes exceptions. Check with the anti-censorship team before doing a major version update in case there is incompatibilities. - [ ] ***(Optional)*** Update `projects/go/config` - [ ] `version` : update go version - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) @@ -88,7 +88,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] ***(Optional)*** If new version is available: - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to `tb-build-02.torproject.org` - [ ] Deploy to `tb-builder`'s `public_html` directory: - - `sudo -u tb-builder cp manual_$PIPELINEID.zip ~/../tb-builder/public_html/.` + - `sudo -u tb-builder cp manual_$PIPELINEID.zip ~tb-builder/public_html/.` - [ ] Update `projects/manual/config`: - [ ] Change the `version` to `$PIPELINEID` - [ ] Update `sha256sum` in the `input_files` section @@ -108,25 +108,25 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12` - `--date $date` is optional, if omitted it will be the date on which you run the command - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output - - [ ] Open MR with above changes, using the template for release preparations - - [ ] Merge - - [ ] Sign+Tag - - **NOTE** this must be done by one of: - - boklm - - dan - - ma1 - - pierov - - richard - - [ ] Run: `make torbrowser-signtag-release` - - [ ] Push tag to `upstream` - - [ ] Build on at least one of: - - Run `make torbrowser-release && make torbrowser-incrementals-release` +- [ ] Open MR with above changes, using the template for release preparations +- [ ] Merge +- [ ] Sign+Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make torbrowser-signtag-release` + - [ ] Push tag to `upstream` +- [ ] Build the tag: + - Run `make torbrowser-release && make torbrowser-incrementals-release` - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - **NOTE** this requires a devmole authentication token - Run `make torbrowser-kick-devmole-build` - - [ ] Ensure builders have matching builds +- [ ] Ensure builders have matching builds </details> @@ -134,49 +134,44 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE <summary>Communications</summary> ### notify stakeholders +- [ ] **(Once builds confirmed matching)** Email tor-qa mailing list with release information + - [ ] tor-qa: tor-qa(a)lists.torproject.org + - **Subject** + ``` + Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) + ``` + - **Body** + ``` + Hello, - <details> - <summary>email template</summary> - - Subject: - Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) - - Body: - Hello All, - - Unsigned Tor Browser $(TOR_BROWSER_VERSION) release candidate builds are now available for testing: - - - https://tb-build-05.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… - - The full changelog can be found here: + Unsigned Tor Browser $(TOR_BROWSER_VERSION) release candidate builds are now available for testing: - - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/$(T… + - https://tb-build-02.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… - </details> + The full changelog can be found here: -- [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - ***(Optional)*** Additional information: - - [ ] Note any new functionality which needs testing - - [ ] Link to any known issues + - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$(TB… + ``` - [ ] Email packagers: - - Recipients: - - Tails dev mailing list: tails-dev(a)boum.org - - Guardian Project: nathan(a)guardianproject.info - - torbrowser-launcher: micah(a)micahflee.com - - FreeBSD port: freebsd(a)sysctl.cz  - - OpenBSD port: caspar(a)schutijser.com  - - [ ] ***(Optional)*** Note any changes which may affect packaging/downstream integration + - [ ] Tails dev mailing list: tails-dev(a)boum.org + - [ ] Guardian Project: nathan(a)guardianproject.info + - [ ] FreeBSD port: freebsd(a)sysctl.cz  + - [ ] OpenBSD port: caspar(a)schutijser.com  + - [ ] Note any changes which may affect packaging/downstream integration </details> <details> <summary>Signing</summary> -### signing +### release signing - **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long +- [ ] Assign this issue to the signer, one of: + - boklm + - richard - [ ] On `$(STAGING_SERVER)`, ensure updated: - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)` - - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - [ ] `tor-browser-build/tools/signing/set-config.hosts` - `ssh_host_builder` : ssh hostname of machine with unsigned builds - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - `ssh_host_linux_signer` : ssh hostname of linux signing machine @@ -189,9 +184,9 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.torbrowser` +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.torbrowser` - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: @@ -201,20 +196,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc) - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` -- [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` -- [ ] Publish APKs to Google Play: - - Log into https://play.google.com/apps/publish - - Select `Tor Browser` app - - Navigate to `Release > Production` and click `Create new release` button: - - Upload the `tor-browser-android-*.apk` APKs - - Update Release Name to Tor Browser version number - - Update Release Notes - - Next to 'Release notes', click `Copy from a previous release` - - Edit blog post url to point to most recent blog post - - Save, review, and configure rollout percentage - - [ ] 25% rollout when publishing a scheduled update - - [ ] 100% rollout when publishing a security-driven release - - [ ] Update rollout percentage to 100% after confirmed no major issues + - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` </details> @@ -223,33 +205,51 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE <details> <summary>Check whether the .exe files got properly signed and timestamped</summary> - ``` - # Point OSSLSIGNCODE to your osslsigncode binary - pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION - OSSLSIGNCODE=/path/to/osslsigncode - ../../../tools/authenticode_check.sh - popd - ``` + +```bash +# Point OSSLSIGNCODE to your osslsigncode binary +pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +OSSLSIGNCODE=/path/to/osslsigncode +../../../tools/authenticode_check.sh +popd +``` + </details> <details> <summary>Check whether the MAR files got properly signed</summary> - ``` - # Point NSSDB to your nssdb containing the mar signing certificate - # Point SIGNMAR to your signmar binary - # Point LD_LIBRARY_PATH to your mar-tools directory - pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION - NSSDB=/path/to/nssdb - SIGNMAR=/path/to/mar-tools/signmar - LD_LIBRARY_PATH=/path/to/mar-tools/ - ../../../tools/marsigning_check.sh - popd - ``` + +```bash +# Point NSSDB to your nssdb containing the mar signing certificate +# Point SIGNMAR to your signmar binary +# Point LD_LIBRARY_PATH to your mar-tools directory +pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +NSSDB=/path/to/nssdb +SIGNMAR=/path/to/mar-tools/signmar +LD_LIBRARY_PATH=/path/to/mar-tools/ +../../../tools/marsigning_check.sh +popd +``` + </details> </details> <details> <summary>Publishing</summary> +### Google Play: https://play.google.com/apps/publish +- [ ] Publish APKs to Google Play: + - Select `Tor Browser` app + - Navigate to `Release > Production` and click `Create new release` button: + - Upload the `tor-browser-android-*.apk` APKs + - Update Release Name to Tor Browser version number + - Update Release Notes + - Next to 'Release notes', click `Copy from a previous release` + - Edit blog post url to point to most recent blog post + - Save, review, and configure rollout percentage + - [ ] 25% rollout when publishing a scheduled update + - [ ] 100% rollout when publishing a security-driven release + - [ ] Update rollout percentage to 100% after confirmed no major issues + ### website: https://gitlab.torproject.org/tpo/web/tpo.git - [ ] `databags/versions.ini` : Update the downloads versions - `torbrowser-stable/version` : sort of a catch-all for latest stable version @@ -258,49 +258,37 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - `torbrowser-*-alpha/version` : platform-specific alpha versions - `tor-stable`,`tor-alpha` : set by tor devs, do not touch - [ ] Push to origin as new branch, open 'Draft :' MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded +- [ ] Remove `Draft:` from MR once signed-packages are accessible on https://dist.torproject.org - [ ] Merge - [ ] Publish after CI passes and builds are published ### blog: https://gitlab.torproject.org/tpo/web/blog.git - -- [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : - - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) - - [ ] Update Tor Browser version numbers - - [ ] Note any ESR rebase - - [ ] Link to any Firefox security updates from ESR upgrade - - [ ] Link to any Android-specific security backports - - [ ] Note any updates to : - - tor - - OpenSSL - - NoScript - - [ ] Convert ChangeLog.txt to markdown format used here by : - - `tor-browser-build/tools/changelog-format-blog-post` +- [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) + - [ ] Note any ESR update + - [ ] Note any updates to dependencies (OpenSSL, zlib, NoScript, tor, etc) + - [ ] Thank any users which have contributed patches - [ ] Push to origin as new branch, open `Draft:` MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded -- [ ] Merge +- [ ] Merge once signed-packages are accessible on https://dist.torproject.org - [ ] Publish after CI passes and website has been updated ### tor-announce mailing list - <details> - <summary>email template</summary> - - Subject: - New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) - - Body: - Hi everyone, - - Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: - - - $(BLOG_POST_URL) +- [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org + - **Subject** + ``` + New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) + ``` + - **Body** + ``` + Hi everyone, - </details> + Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: + - $(BLOG_POST_URL) -- [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org - - **(Optional)** Additional information: - - [ ] Link to any known issues + Changelog: + # paste changleog as quote here + ``` </details> /label ~"Release Prep" + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… 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! Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 21 Feb '24

21 Feb '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 16ff4ed5 by clairehurst at 2024-02-21T07:36:28+00:00 fixup! Disable features and functionality - - - - - 5 changed files: - fenix/app/src/beta/res/xml/shortcuts.xml - fenix/app/src/debug/res/xml/shortcuts.xml - fenix/app/src/main/res/xml/shortcuts.xml - fenix/app/src/nightly/res/xml/shortcuts.xml - fenix/app/src/release/res/xml/shortcuts.xml Changes: ===================================== fenix/app/src/beta/res/xml/shortcuts.xml ===================================== @@ -25,15 +25,15 @@    - <shortcut - android:shortcutId="open_new_private_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_private_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.torproject.torbrowser_alpha" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + </shortcuts> ===================================== fenix/app/src/debug/res/xml/shortcuts.xml ===================================== @@ -26,15 +26,15 @@    - <shortcut - android:shortcutId="open_new_private_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_private_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.torproject.torbrowser_debug" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + </shortcuts> ===================================== fenix/app/src/main/res/xml/shortcuts.xml ===================================== @@ -26,15 +26,15 @@    - <shortcut - android:shortcutId="open_new_private_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_private_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.torproject.torbrowser_dev" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + </shortcuts> ===================================== fenix/app/src/nightly/res/xml/shortcuts.xml ===================================== @@ -26,15 +26,15 @@    - <shortcut - android:shortcutId="open_new_private_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_private_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.torproject.torbrowser_nightly" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + </shortcuts> ===================================== fenix/app/src/release/res/xml/shortcuts.xml ===================================== @@ -25,15 +25,15 @@    - <shortcut - android:shortcutId="open_new_private_tab" - android:enabled="true" - android:icon="@drawable/ic_static_shortcut_private_tab" - android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" - android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> - <intent - android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" - android:targetPackage="org.torproject.torbrowser" - android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> - </shortcut> + + + + + + + + + + + </shortcuts> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/16f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/16f… 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! Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 21 Feb '24

21 Feb '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 5cdf04d8 by Dan Ballard at 2024-02-14T15:01:27-08:00 fixup! Disable features and functionality bug 42407: lock task affinity of HomeActivity to block potential on app phishing - - - - - 1 changed file: - fenix/app/src/main/AndroidManifest.xml Changes: ===================================== fenix/app/src/main/AndroidManifest.xml ===================================== @@ -96,6 +96,7 @@ android:exported="true" android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|layoutDirection|smallestScreenSize|screenLayout" android:launchMode="singleTask" + android:taskAffinity="" android:resizeableActivity="true" android:supportsPictureInPicture="true" android:windowSoftInputMode="adjustResize"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! MB 1: Mullvad Browser branding
by Pier Angelo Vendrame (＠pierov) 20 Feb '24

20 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: daa6f9fe by Pier Angelo Vendrame at 2024-02-20T20:35:23+01:00 fixup! MB 1: Mullvad Browser branding Bug 42398: Include Alpha and Nightly in MOZ_APP_DISPLAYNAME. - - - - - 2 changed files: - browser/branding/mb-alpha/configure.sh - browser/branding/mb-nightly/configure.sh Changes: ===================================== browser/branding/mb-alpha/configure.sh ===================================== @@ -2,4 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Mullvad Browser" +MOZ_APP_DISPLAYNAME="Mullvad Browser Alpha" ===================================== browser/branding/mb-nightly/configure.sh ===================================== @@ -2,4 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Mullvad Browser" +MOZ_APP_DISPLAYNAME="Mullvad Browser Nightly" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/daa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/daa… 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.8.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 20 Feb '24

20 Feb '24

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

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 19 commits: MB 38: Mullvad Browser configuration
by richard (＠richard) 20 Feb '24

20 Feb '24

richard pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: bbc14876 by Pier Angelo Vendrame at 2024-02-13T15:46:46+01:00 MB 38: Mullvad Browser configuration - - - - - 6b55ddd7 by Pier Angelo Vendrame at 2024-02-13T15:46:48+01:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - a6dfd571 by Pier Angelo Vendrame at 2024-02-13T15:46:49+01:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - d2096615 by Pier Angelo Vendrame at 2024-02-13T15:46:49+01:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 9c5554d3 by Pier Angelo Vendrame at 2024-02-13T15:46:49+01:00 MB 37: Customization for the about dialog - - - - - 9e29111f by Henry Wilkes at 2024-02-13T15:46:50+01:00 MB 39: Add home page about:mullvad-browser - - - - - 183082a9 by hackademix at 2024-02-13T15:46:50+01:00 MB 97: Remove UI cues to install new extensions. - - - - - 40d1c644 by hackademix at 2024-02-13T15:46:50+01:00 MB 47: uBlock Origin customization - - - - - 3fdae332 by Pier Angelo Vendrame at 2024-02-13T15:46:51+01:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 13e371aa by Pier Angelo Vendrame at 2024-02-13T15:46:51+01:00 MB 87: Disable the default browser box on Windows and Linux Windows and Linux will be distributed only as portable apps at the beginning, so they should not be settable as default browsers. We will need to improve the logic once we decide to ship system-wide installers, too. - - - - - 7418154f by Pier Angelo Vendrame at 2024-02-13T15:46:51+01:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - fb662c89 by Pier Angelo Vendrame at 2024-02-13T15:46:52+01:00 fixup! MB 112: Updater customization for Mullvad Browser MB 200: Enable system installs for Mullvad Browser Customize the post update executable name, to avoid any confusion with Mozilla's helper.exe, since we intend using a much simpler post update binary. - - - - - 8346f9be by Nicolas Vigier at 2024-02-13T15:46:52+01:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 146b9349 by Pier Angelo Vendrame at 2024-02-13T15:46:52+01:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - afb9a182 by Pier Angelo Vendrame at 2024-02-13T15:46:52+01:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 134937fa by hackademix at 2024-02-13T15:46:53+01:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 11cb17c9 by Richard Pospesel at 2024-02-13T15:46:53+01:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - e7cc72c0 by rui hildt at 2024-02-13T15:46:53+01:00 MB 213: Customize the search engines list - - - - - 939faf11 by hackademix at 2024-02-13T15:46:54+01:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/2f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/2f… 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 41085: Fix typos in generated cdn.stagemole.eu URL build hash location
by richard (＠richard) 20 Feb '24

20 Feb '24

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: c838ed34 by Richard Pospesel at 2024-02-20T12:55:04+00:00 Bug 41085: Fix typos in generated cdn.stagemole.eu URL build hash location (cherry picked from commit 6778ba32945e9c4a49d1bbbb93a9e85db0222939) - - - - - 1 changed file: - projects/release/kick_devmole_build Changes: ===================================== projects/release/kick_devmole_build ===================================== @@ -39,4 +39,4 @@ fi curl -X POST "https://drone-server.devmole.eu/api/repos/mullvad/browser-build/builds?bran…" -H "Authorization: Bearer ${AUTH_TOKEN}" -H "Accept: application/json" echo -echo Hashes will appear here: https://cdn.stagemole.eu/hashes/[% c("var/projectname") %]/[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] +echo Hashes will appear here: https://cdn.stagemole.eu/browser/hashes/[% c("var/projectname") %]/[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]/ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- 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/tor-browser-build][main] Bug 41085: Fix typos in generated cdn.stagemole.eu URL build hash location
by richard (＠richard) 20 Feb '24

20 Feb '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6778ba32 by Richard Pospesel at 2024-02-20T12:52:59+00:00 Bug 41085: Fix typos in generated cdn.stagemole.eu URL build hash location - - - - - 1 changed file: - projects/release/kick_devmole_build Changes: ===================================== projects/release/kick_devmole_build ===================================== @@ -39,4 +39,4 @@ fi curl -X POST "https://drone-server.devmole.eu/api/repos/mullvad/browser-build/builds?bran…" -H "Authorization: Bearer ${AUTH_TOKEN}" -H "Accept: application/json" echo -echo Hashes will appear here: https://cdn.stagemole.eu/hashes/[% c("var/projectname") %]/[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] +echo Hashes will appear here: https://cdn.stagemole.eu/browser/hashes/[% c("var/projectname") %]/[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]/ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.0.10
by richard (＠richard) 20 Feb '24

20 Feb '24

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: d0f551a3 by Richard Pospesel at 2024-02-20T12:29:05+00:00 release: new version, 13.0.10 - - - - - 30 changed files: - update_3/release/.htaccess - + update_3/release/13.0.10-linux-i686-ALL.xml - + update_3/release/13.0.10-linux-x86_64-ALL.xml - + update_3/release/13.0.10-macos-ALL.xml - + update_3/release/13.0.10-windows-i686-ALL.xml - + update_3/release/13.0.10-windows-x86_64-ALL.xml - − update_3/release/13.0.6-13.0.9-linux-i686-ALL.xml - − update_3/release/13.0.6-13.0.9-linux-x86_64-ALL.xml - − update_3/release/13.0.6-13.0.9-macos-ALL.xml - − update_3/release/13.0.6-13.0.9-windows-i686-ALL.xml - − update_3/release/13.0.6-13.0.9-windows-x86_64-ALL.xml - + update_3/release/13.0.7-13.0.10-linux-i686-ALL.xml - + update_3/release/13.0.7-13.0.10-linux-x86_64-ALL.xml - + update_3/release/13.0.7-13.0.10-macos-ALL.xml - + update_3/release/13.0.7-13.0.10-windows-i686-ALL.xml - + update_3/release/13.0.7-13.0.10-windows-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.9-linux-i686-ALL.xml - − update_3/release/13.0.7-13.0.9-linux-x86_64-ALL.xml - − update_3/release/13.0.7-13.0.9-macos-ALL.xml - − update_3/release/13.0.7-13.0.9-windows-i686-ALL.xml - − update_3/release/13.0.7-13.0.9-windows-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.10-linux-i686-ALL.xml - + update_3/release/13.0.8-13.0.10-linux-x86_64-ALL.xml - + update_3/release/13.0.8-13.0.10-macos-ALL.xml - + update_3/release/13.0.8-13.0.10-windows-i686-ALL.xml - + update_3/release/13.0.8-13.0.10-windows-x86_64-ALL.xml - − update_3/release/13.0.8-13.0.9-linux-i686-ALL.xml - − update_3/release/13.0.8-13.0.9-linux-x86_64-ALL.xml - − update_3/release/13.0.8-13.0.9-macos-ALL.xml - − update_3/release/13.0.8-13.0.9-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… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41084: $app_bundle is missing the final .app
by Pier Angelo Vendrame (＠pierov) 20 Feb '24

20 Feb '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 97837a74 by Pier Angelo Vendrame at 2024-02-20T09:16:21+01:00 Bug 41084: $app_bundle is missing the final .app Fixes a bug introduced while resolving #40569. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -187,7 +187,7 @@ echo "Starting ./mach build $(date)" [% IF c("var/base-browser") -%] mv "$distdir/Firefox.app" "$distdir/[% c('var/display_name') %].app" [% END -%] - app_bundle="[% c('var/display_name') %]" + app_bundle="[% c('var/display_name') %].app" # Remove firefox-bin (we don't use it, see ticket #10126) rm -f "$distdir/$app_bundle/Contents/MacOS/[% c('var/exe_name') %]-bin" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0