- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time
by boklm (＠boklm) 17 Apr '23

17 Apr '23

boklm pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: e51dec66 by Nicolas Vigier at 2023-04-17T19:03:44+02:00 Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time - - - - - 4 changed files: - projects/hfsplus-tools/build - projects/hfsplus-tools/config - + projects/hfsplus-tools/ignore-timezone.diff - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/hfsplus-tools/build ===================================== @@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz cd diskdev_cmds-[% c("version") %] patch -p1 < $rootdir/newfs_hfs.diff +patch -p1 < $rootdir/ignore-timezone.diff make -j[% c("num_procs") %] ===================================== projects/hfsplus-tools/config ===================================== @@ -21,3 +21,6 @@ input_files: # exist on Linux (at that path) and is not required on Linux either, and make # the UUID deterministic. - filename: newfs_hfs.diff + # Remove UTCToLocal conversion to avoid a different result when hwclock + # is set to local time or utc time (tor-browser-build#40844) + - filename: ignore-timezone.diff ===================================== projects/hfsplus-tools/ignore-timezone.diff ===================================== @@ -0,0 +1,13 @@ +diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c +--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2012-02-02 23:36:59.000000000 +0100 ++++ diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c 2023-04-17 13:59:41.993000000 +0200 +@@ -463,8 +463,7 @@ + } + hp->lastMountedVersion = kHFSPlusMountVersion; + +- /* NOTE: create date is in local time, not GMT! */ +- hp->createDate = UTCToLocal(defaults->createDate); ++ hp->createDate = defaults->createDate; + hp->modifyDate = defaults->createDate; + hp->backupDate = 0; + hp->checkedDate = defaults->createDate; ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -45,7 +45,7 @@ test -f "$libdmg_file" || \ "You can build it with:" \ " ./rbm/rbm build --target no_containers libdmg-hfsplus" \ "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies" -hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz" +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz" test -f "$hfstools_file" || \ exit_error "$hfstools_file is missing." \ "You can build it with:" \ 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-build][maint-12.0] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time
by boklm (＠boklm) 17 Apr '23

17 Apr '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 8c7da1d9 by Nicolas Vigier at 2023-04-17T18:59:23+02:00 Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time - - - - - 4 changed files: - projects/hfsplus-tools/build - projects/hfsplus-tools/config - + projects/hfsplus-tools/ignore-timezone.diff - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/hfsplus-tools/build ===================================== @@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz cd diskdev_cmds-[% c("version") %] patch -p1 < $rootdir/newfs_hfs.diff +patch -p1 < $rootdir/ignore-timezone.diff make -j[% c("num_procs") %] ===================================== projects/hfsplus-tools/config ===================================== @@ -21,3 +21,6 @@ input_files: # exist on Linux (at that path) and is not required on Linux either, and make # the UUID deterministic. - filename: newfs_hfs.diff + # Remove UTCToLocal conversion to avoid a different result when hwclock + # is set to local time or utc time (tor-browser-build#40844) + - filename: ignore-timezone.diff ===================================== projects/hfsplus-tools/ignore-timezone.diff ===================================== @@ -0,0 +1,13 @@ +diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c +--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2012-02-02 23:36:59.000000000 +0100 ++++ diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c 2023-04-17 13:59:41.993000000 +0200 +@@ -463,8 +463,7 @@ + } + hp->lastMountedVersion = kHFSPlusMountVersion; + +- /* NOTE: create date is in local time, not GMT! */ +- hp->createDate = UTCToLocal(defaults->createDate); ++ hp->createDate = defaults->createDate; + hp->modifyDate = defaults->createDate; + hp->backupDate = 0; + hp->checkedDate = defaults->createDate; ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -45,7 +45,7 @@ test -f "$libdmg_file" || \ "You can build it with:" \ " ./rbm/rbm build --target no_containers libdmg-hfsplus" \ "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies" -hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz" +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz" test -f "$hfstools_file" || \ exit_error "$hfstools_file is missing." \ "You can build it with:" \ 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/tor-browser-build][main] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time
by boklm (＠boklm) 17 Apr '23

17 Apr '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a00cfb3c by Nicolas Vigier at 2023-04-17T18:58:08+02:00 Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time - - - - - 4 changed files: - projects/hfsplus-tools/build - projects/hfsplus-tools/config - + projects/hfsplus-tools/ignore-timezone.diff - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/hfsplus-tools/build ===================================== @@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz cd diskdev_cmds-[% c("version") %] patch -p1 < $rootdir/newfs_hfs.diff +patch -p1 < $rootdir/ignore-timezone.diff make -j[% c("num_procs") %] ===================================== projects/hfsplus-tools/config ===================================== @@ -21,3 +21,6 @@ input_files: # exist on Linux (at that path) and is not required on Linux either, and make # the UUID deterministic. - filename: newfs_hfs.diff + # Remove UTCToLocal conversion to avoid a different result when hwclock + # is set to local time or utc time (tor-browser-build#40844) + - filename: ignore-timezone.diff ===================================== projects/hfsplus-tools/ignore-timezone.diff ===================================== @@ -0,0 +1,13 @@ +diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c +--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2012-02-02 23:36:59.000000000 +0100 ++++ diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c 2023-04-17 13:59:41.993000000 +0200 +@@ -463,8 +463,7 @@ + } + hp->lastMountedVersion = kHFSPlusMountVersion; + +- /* NOTE: create date is in local time, not GMT! */ +- hp->createDate = UTCToLocal(defaults->createDate); ++ hp->createDate = defaults->createDate; + hp->modifyDate = defaults->createDate; + hp->backupDate = 0; + hp->checkedDate = defaults->createDate; ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -45,7 +45,7 @@ test -f "$libdmg_file" || \ "You can build it with:" \ " ./rbm/rbm build --target no_containers libdmg-hfsplus" \ "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies" -hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz" +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz" test -f "$hfstools_file" || \ exit_error "$hfstools_file is missing." \ "You can build it with:" \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40811: Make it easier to test the updater
by Pier Angelo Vendrame (＠pierov) 17 Apr '23

17 Apr '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7968b10a by Pier Angelo Vendrame at 2023-04-17T17:04:05+02:00 Bug 40811: Make it easier to test the updater This commit adds a config variable to override the URL for the updater. When it is defined, a user-provided certificate will replace the default public keys used to sign nightly builds. - - - - - 3 changed files: - .gitignore - projects/firefox/build - projects/firefox/config Changes: ===================================== .gitignore ===================================== @@ -14,3 +14,7 @@ /release /alpha /nightly + +# This file is used to test the updater, and whoever is interested in doing so, +# should provide their file. +/projects/firefox/marsigner.der ===================================== projects/firefox/build ===================================== @@ -92,7 +92,10 @@ fi popd [% END %] -[% IF c("var/nightly") && ! c("var/mullvad-browser") -%] +[% IF c("var/override_updater_url") -%] + sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=[% c("var/override_updater_url") %]|' build/application.ini.in + cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der +[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%] # Set update url for nightly (#33402 / #40033) sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] ===================================== projects/firefox/config ===================================== @@ -30,6 +30,12 @@ var: - pkg-config has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]' + # Uncomment this if you want to test the updater. You will need to provide a + # marsigner.der in this directory, too. It will be used as a replacement for + # the nightly builds keys only. So, using this option for alphas and releases + # will not work (the browser will fail with a key/signature mismatch). + # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%…' + rezip: | rezip_tmpdir=$(mktemp -d) mkdir -p "$rezip_tmpdir/z" @@ -199,6 +205,8 @@ input_files: name: translation-tor-browser pkg_type: tor-browser enable: '[% c("var/tor-browser") && c("var/has_l10n") %]' + - filename: marsigner.der + enable: '[% c("var/override_updater_url") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin 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][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 17 Apr '23

17 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d2c3dcac by Henry Wilkes at 2023-04-17T15:10:44+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41617 - Tidy up: - Lint builtinBridgeDialog.jsm and connectionPane.js. - Use TorConnect.canBeginBootstrap. - Always start Bootstrapping with the built in bridges, regardless of a previous errors. - Wait until settings have been applied before starting bootstrap. - Use new string ids for the new strings. Mark the old ones for removal. - Clean up unused properties. - - - - - 64ea04a6 by Henry Wilkes at 2023-04-17T15:23:13+01:00 fixup! Add TorStrings module for localization Bug 41617 - Tidy up: - Use new string ids for the new strings. Mark the old ones for removal. - Use "website" rather than "web site". - - - - - 4 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -1,35 +1,30 @@ "use strict"; -const obs = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); - var EXPORTED_SYMBOLS = ["BuiltinBridgeDialog"]; +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); + const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); const { TorSettings, - TorSettingsTopics, TorBridgeSource, TorBuiltinBridgeTypes, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); -const { - TorConnect, - TorConnectTopics, - TorConnectState, -} = ChromeUtils.import("resource:///modules/TorConnect.jsm"); +const { TorConnect, TorConnectTopics } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" +); class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._dialog = null; - this._window = null; this._acceptButton = null; } static get selectors() { return { - header: "#torPreferences-builtinBridge-header", description: "#torPreferences-builtinBridge-description", radiogroup: "#torPreferences-builtinBridge-typeSelection", obfsRadio: "#torPreferences-builtinBridges-radioObfs", @@ -38,22 +33,20 @@ class BuiltinBridgeDialog { snowflakeDescr: "#torPreferences-builtinBridges-descrSnowflake", meekAzureRadio: "#torPreferences-builtinBridges-radioMeekAzure", meekAzureDescr: "#torPreferences-builtinBridges-descrMeekAzure", - acceptButton: "accept" /* not really a selector but a key for dialog's getButton */, }; } _populateXUL(window, aDialog) { const selectors = BuiltinBridgeDialog.selectors; - this._window = window; this._dialog = aDialog; const dialogWin = this._dialog.parentElement; dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeHeader); this._dialog.querySelector(selectors.description).textContent = - TorStrings.settings.builtinBridgeDescription; + TorStrings.settings.builtinBridgeDescription2; - this._acceptButton = this._dialog.getButton(selectors.acceptButton); + this._acceptButton = this._dialog.getButton("accept"); this.onTorStateChange(); let radioGroup = this._dialog.querySelector(selectors.radiogroup); @@ -63,19 +56,19 @@ class BuiltinBridgeDialog { elemRadio: this._dialog.querySelector(selectors.obfsRadio), elemDescr: this._dialog.querySelector(selectors.obfsDescr), label: TorStrings.settings.builtinBridgeObfs4Title, - descr: TorStrings.settings.builtinBridgeObfs4Description, + descr: TorStrings.settings.builtinBridgeObfs4Description2, }, snowflake: { elemRadio: this._dialog.querySelector(selectors.snowflakeRadio), elemDescr: this._dialog.querySelector(selectors.snowflakeDescr), label: TorStrings.settings.builtinBridgeSnowflake, - descr: TorStrings.settings.builtinBridgeSnowflakeDescription, + descr: TorStrings.settings.builtinBridgeSnowflakeDescription2, }, "meek-azure": { elemRadio: this._dialog.querySelector(selectors.meekAzureRadio), elemDescr: this._dialog.querySelector(selectors.meekAzureDescr), label: TorStrings.settings.builtinBridgeMeekAzure, - descr: TorStrings.settings.builtinBridgeMeekAzureDescription, + descr: TorStrings.settings.builtinBridgeMeekAzureDescription2, }, }; @@ -96,8 +89,8 @@ class BuiltinBridgeDialog { radioGroup.selectedItem = null; } - this._dialog.addEventListener("dialogaccept", e => { - this.onSubmit(radioGroup.value); + this._dialog.addEventListener("dialogaccept", () => { + this.onSubmit(radioGroup.value, TorConnect.canBeginBootstrap); }); this._dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( @@ -110,14 +103,20 @@ class BuiltinBridgeDialog { this._dialog.style.minWidth = "0"; this._dialog.style.minHeight = "0"; - obs.addObserver(this, TorConnectTopics.StateChange); + Services.obs.addObserver(this, TorConnectTopics.StateChange); } onTorStateChange() { - if (TorConnect.state === TorConnectState.Configuring) { - this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonConnect); + if (TorConnect.canBeginBootstrap) { + this._acceptButton.setAttribute( + "label", + TorStrings.settings.bridgeButtonConnect + ); } else { - this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonAccept); + this._acceptButton.setAttribute( + "label", + TorStrings.settings.bridgeButtonAccept + ); } } @@ -130,25 +129,26 @@ class BuiltinBridgeDialog { observe(subject, topic, data) { switch (topic) { - case TorConnectTopics.StateChange: { + case TorConnectTopics.StateChange: this.onTorStateChange(); break; - } } } close() { // unregister our observer topics - obs.removeObserver(this, TorConnectTopics.StateChange); + Services.obs.removeObserver(this, TorConnectTopics.StateChange); } openDialog(gSubDialog) { gSubDialog.open( "chrome://browser/content/torpreferences/builtinBridgeDialog.xhtml", - { features: "resizable=yes", + { + features: "resizable=yes", closingCallback: () => { this.close(); - },}, + }, + }, this ); } ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -323,7 +323,7 @@ const gConnectionPane = (function() { prefpane.querySelector(selectors.bridges.header).innerText = TorStrings.settings.bridgesHeading; prefpane.querySelector(selectors.bridges.description).textContent = - TorStrings.settings.bridgesDescription; + TorStrings.settings.bridgesDescription2; { const learnMore = prefpane.querySelector(selectors.bridges.learnMore); learnMore.setAttribute("value", TorStrings.settings.learnMore); @@ -424,7 +424,8 @@ const gConnectionPane = (function() { selectors.bridges.currentHeader ); bridgeHeader.textContent = TorStrings.settings.bridgeCurrent; - prefpane.querySelector(selectors.bridges.switchLabel).textContent = TorStrings.settings.allBridgesEnabled; + prefpane.querySelector(selectors.bridges.switchLabel).textContent = + TorStrings.settings.allBridgesEnabled; const bridgeSwitch = prefpane.querySelector(selectors.bridges.switch); bridgeSwitch.addEventListener("change", () => { TorSettings.bridges.enabled = bridgeSwitch.checked; @@ -887,34 +888,34 @@ const gConnectionPane = (function() { }); } - { - this._confirmBridgeRemoval = () => { - const aParentWindow = Services.wm.getMostRecentWindow("navigator:browser"); - - const ps = Services.prompt; - const btnFlags = - ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING + - ps.BUTTON_POS_0_DEFAULT + - ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL; - - const notUsed = { value: false }; - const btnIndex = ps.confirmEx( - aParentWindow, - TorStrings.settings.bridgeRemoveAllDialogTitle, - TorStrings.settings.bridgeRemoveAllDialogDescription, - btnFlags, - TorStrings.settings.remove, - null, - null, - null, - notUsed - ); + this._confirmBridgeRemoval = () => { + const aParentWindow = Services.wm.getMostRecentWindow( + "navigator:browser" + ); - if (btnIndex === 0) { - this.onRemoveAllBridges(); - } - }; - } + const ps = Services.prompt; + const btnFlags = + ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING + + ps.BUTTON_POS_0_DEFAULT + + ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL; + + const notUsed = { value: false }; + const btnIndex = ps.confirmEx( + aParentWindow, + TorStrings.settings.bridgeRemoveAllDialogTitle, + TorStrings.settings.bridgeRemoveAllDialogDescription, + btnFlags, + TorStrings.settings.remove, + null, + null, + null, + notUsed + ); + + if (btnIndex === 0) { + this.onRemoveAllBridges(); + } + }; // Advanced setup prefpane.querySelector(selectors.advanced.header).innerText = @@ -1058,25 +1059,41 @@ const gConnectionPane = (function() { }, onAddBuiltinBridge() { - const builtinBridgeDialog = new BuiltinBridgeDialog(aBridgeType => { - if (!aBridgeType) { - TorSettings.bridges.enabled = false; - TorSettings.bridges.builtin_type = ""; - } else { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BuiltIn; - TorSettings.bridges.builtin_type = aBridgeType; - } - TorSettings.saveToPrefs(); - TorSettings.applySettings().then(result => { + const builtinBridgeDialog = new BuiltinBridgeDialog( + async (bridgeType, connect) => { + if (!bridgeType) { + TorSettings.bridges.enabled = false; + TorSettings.bridges.builtin_type = ""; + } else { + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.BuiltIn; + TorSettings.bridges.builtin_type = bridgeType; + } + TorSettings.saveToPrefs(); + await TorSettings.applySettings(); + this._populateBridgeCards(); - }); - // The bridge dialog button is "connect" when Tor is not bootstrapped, - // so do the connect - if (TorConnect.state == TorConnectState.Configuring) { - TorConnect.openTorConnect({ beginBootstrap: true }) + + // The bridge dialog button is "connect" when Tor is not bootstrapped, + // so do the connect. + if (connect) { + // Start Bootstrapping, which should use the configured bridges. + // NOTE: We do this regardless of any previous TorConnect Error. + if (TorConnect.canBeginBootstrap) { + TorConnect.beginBootstrap(); + } + // Open "about:torconnect". + // FIXME: If there has been a previous bootstrapping error then + // "about:torconnect" will be trying to get the user to use + // AutoBootstrapping. It is not set up to handle a forced direct + // entry to plain Bootstrapping from this dialog so the UI will not + // be aligned. In particular the + // AboutTorConnect.uiState.bootstrapCause will be aligned to + // whatever was shown previously in "about:torconnect" instead. + TorConnect.openTorConnect(); + } } - }); + ); builtinBridgeDialog.openDialog(gSubDialog); }, ===================================== browser/modules/TorStrings.jsm ===================================== @@ -94,7 +94,7 @@ const Loader = { quickstartCheckbox: "Always connect automatically", // Bridge settings bridgesHeading: "Bridges", - bridgesDescription: + 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.", bridgeLocation: "Your location", bridgeLocationAutomatic: "Automatic", @@ -116,7 +116,8 @@ const Loader = { allBridgesEnabled: "Use current bridges", bridgeRemoveAll: "Remove All Bridges", bridgeRemoveAllDialogTitle: "Remove all bridges?", - bridgeRemoveAllDialogDescription: "If these bridges were received from torproject.org or added manually, this action cannot be undone", + bridgeRemoveAllDialogDescription: + "If these bridges were received from torproject.org or added manually, this action cannot be undone", bridgeAdd: "Add a New Bridge", bridgeSelectBrowserBuiltin: "Choose from one of Tor Browser’s built-in bridges", @@ -138,20 +139,18 @@ const Loader = { // Scan bridge QR dialog scanQrTitle: "Scan the QR code", // Builtin bridges dialog - builtinBridgeTitle: "Built-In Bridges", builtinBridgeHeader: "Select a Built-In Bridge", - builtinBridgeDescription: + builtinBridgeDescription2: "Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.", - builtinBridgeObfs4: "obfs4", builtinBridgeObfs4Title: "obfs4 (Built-in)", - builtinBridgeObfs4Description: + builtinBridgeObfs4Description2: "Makes your Tor traffic look like random data. May not work in heavily censored regions.", builtinBridgeSnowflake: "Snowflake", - builtinBridgeSnowflakeDescription: + builtinBridgeSnowflakeDescription2: "Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.", builtinBridgeMeekAzure: "meek-azure", - builtinBridgeMeekAzureDescription: - "Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow.", + builtinBridgeMeekAzureDescription2: + "Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow.", bridgeButtonConnect: "Connect", bridgeButtonAccept: "OK", // Request bridges dialog ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -26,7 +26,9 @@ settings.quickstartCheckbox=Always connect automatically # Bridge settings settings.bridgesHeading=Bridges -settings.bridgesDescription=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. +# 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 settings.bridgeLocationFrequent=Frequently selected locations @@ -72,20 +74,26 @@ settings.cancel=Cancel settings.scanQrTitle=Scan the QR code # Builtin bridges dialog -settings.builtinBridgeTitle=Built-In Bridges -# Bug 41617: Todo - delete builtinBridgeHeader, no longer user settings.builtinBridgeHeader=Select a Built-In Bridge -settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. -settings.builtinBridgeObfs4=obfs4 +settings.builtinBridgeDescription2=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. settings.builtinBridgeObfs4Title=obfs4 (Built-in) -settings.builtinBridgeObfs4Description=Makes your Tor traffic look like random data. May not work in heavily censored regions. +settings.builtinBridgeObfs4Description2=Makes your Tor traffic look like random data. May not work in heavily censored regions. settings.builtinBridgeSnowflake=Snowflake -settings.builtinBridgeSnowflakeDescription=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. +settings.builtinBridgeSnowflakeDescription2=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. settings.builtinBridgeMeekAzure=meek-azure -settings.builtinBridgeMeekAzureDescription=Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow. +settings.builtinBridgeMeekAzureDescription2=Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow. 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 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f0df64… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f0df64… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted branch 12.0.5-build2
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel deleted branch 12.0.5-build2 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] fixup! Bug 40814: Prepare stable release 12.0.5
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 0abc4667 by Richard Pospesel at 2023-04-14T18:32:33+00:00 fixup! Bug 40814: Prepare stable release 12.0.5 updated build tag to build2 - - - - - 1 changed file: - rbm.conf Changes: ===================================== rbm.conf ===================================== @@ -72,7 +72,7 @@ buildconf: var: torbrowser_version: '12.0.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 12.0.4 build_mar: 1 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][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 84b47639 by Dan Ballard at 2023-04-14T20:35:41+00:00 fixup! Add TorStrings module for localization Bug 41617: Improve the UX of the built-in bridges dialog - - - - - f0df6486 by Dan Ballard at 2023-04-14T21:02:03+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41617: Improve the UX of the built-in bridges dialog - - - - - 5 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -1,19 +1,30 @@ "use strict"; +const obs = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); + var EXPORTED_SYMBOLS = ["BuiltinBridgeDialog"]; const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); const { TorSettings, + TorSettingsTopics, TorBridgeSource, TorBuiltinBridgeTypes, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); +const { + TorConnect, + TorConnectTopics, + TorConnectState, +} = ChromeUtils.import("resource:///modules/TorConnect.jsm"); + class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._dialog = null; + this._window = null; + this._acceptButton = null; } static get selectors() { @@ -27,27 +38,31 @@ class BuiltinBridgeDialog { snowflakeDescr: "#torPreferences-builtinBridges-descrSnowflake", meekAzureRadio: "#torPreferences-builtinBridges-radioMeekAzure", meekAzureDescr: "#torPreferences-builtinBridges-descrMeekAzure", + acceptButton: "accept" /* not really a selector but a key for dialog's getButton */, }; } _populateXUL(window, aDialog) { const selectors = BuiltinBridgeDialog.selectors; + this._window = window; this._dialog = aDialog; const dialogWin = this._dialog.parentElement; - dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeTitle); + dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeHeader); - this._dialog.querySelector(selectors.header).textContent = - TorStrings.settings.builtinBridgeHeader; this._dialog.querySelector(selectors.description).textContent = TorStrings.settings.builtinBridgeDescription; + + this._acceptButton = this._dialog.getButton(selectors.acceptButton); + this.onTorStateChange(); + let radioGroup = this._dialog.querySelector(selectors.radiogroup); let types = { obfs4: { elemRadio: this._dialog.querySelector(selectors.obfsRadio), elemDescr: this._dialog.querySelector(selectors.obfsDescr), - label: TorStrings.settings.builtinBridgeObfs4, + label: TorStrings.settings.builtinBridgeObfs4Title, descr: TorStrings.settings.builtinBridgeObfs4Description, }, snowflake: { @@ -94,6 +109,16 @@ class BuiltinBridgeDialog { // Hack: see the CSS this._dialog.style.minWidth = "0"; this._dialog.style.minHeight = "0"; + + obs.addObserver(this, TorConnectTopics.StateChange); + } + + onTorStateChange() { + if (TorConnect.state === TorConnectState.Configuring) { + this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonConnect); + } else { + this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonAccept); + } } init(window, aDialog) { @@ -103,10 +128,27 @@ class BuiltinBridgeDialog { }, 0); } + observe(subject, topic, data) { + switch (topic) { + case TorConnectTopics.StateChange: { + this.onTorStateChange(); + break; + } + } + } + + close() { + // unregister our observer topics + obs.removeObserver(this, TorConnectTopics.StateChange); + } + openDialog(gSubDialog) { gSubDialog.open( "chrome://browser/content/torpreferences/builtinBridgeDialog.xhtml", - { features: "resizable=yes" }, + { features: "resizable=yes", + closingCallback: () => { + this.close(); + },}, this ); } ===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -8,7 +8,6 @@ xmlns:html="http://www.w3.org/1999/xhtml"> <dialog id="torPreferences-builtinBridge-dialog" buttons="help,accept,cancel"> - <html:h3 id="torPreferences-builtinBridge-header"></html:h3> <description> <html:div id="torPreferences-builtinBridge-description"><br/></html:div> </description> ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1071,6 +1071,11 @@ const gConnectionPane = (function() { TorSettings.applySettings().then(result => { this._populateBridgeCards(); }); + // The bridge dialog button is "connect" when Tor is not bootstrapped, + // so do the connect + if (TorConnect.state == TorConnectState.Configuring) { + TorConnect.openTorConnect({ beginBootstrap: true }) + } }); builtinBridgeDialog.openDialog(gSubDialog); }, ===================================== browser/modules/TorStrings.jsm ===================================== @@ -95,7 +95,7 @@ const Loader = { // Bridge settings bridgesHeading: "Bridges", 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.", + "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.", bridgeLocation: "Your location", bridgeLocationAutomatic: "Automatic", bridgeLocationFrequent: "Frequently selected locations", @@ -141,16 +141,19 @@ const Loader = { builtinBridgeTitle: "Built-In Bridges", builtinBridgeHeader: "Select a Built-In Bridge", builtinBridgeDescription: - "Tor Browser includes some specific types of bridges known as “pluggable transports”.", + "Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.", builtinBridgeObfs4: "obfs4", + builtinBridgeObfs4Title: "obfs4 (Built-in)", 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.", + "Makes your Tor traffic look like random data. May not work in heavily censored regions.", builtinBridgeSnowflake: "Snowflake", builtinBridgeSnowflakeDescription: - "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.", + "Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.", builtinBridgeMeekAzure: "meek-azure", builtinBridgeMeekAzureDescription: - "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.", + "Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow.", + bridgeButtonConnect: "Connect", + bridgeButtonAccept: "OK", // Request bridges dialog requestBridgeDialogTitle: "Request Bridge", submitCaptcha: "Submit", ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -26,7 +26,7 @@ settings.quickstartCheckbox=Always connect automatically # Bridge settings settings.bridgesHeading=Bridges -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.bridgesDescription=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 settings.bridgeLocationFrequent=Frequently selected locations @@ -73,14 +73,18 @@ settings.scanQrTitle=Scan the QR code # Builtin bridges dialog settings.builtinBridgeTitle=Built-In Bridges +# Bug 41617: Todo - delete builtinBridgeHeader, no longer user settings.builtinBridgeHeader=Select a Built-In Bridge -settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”. +settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. 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.builtinBridgeObfs4Title=obfs4 (Built-in) +settings.builtinBridgeObfs4Description=Makes your Tor traffic look like random data. May not work in heavily censored regions. settings.builtinBridgeSnowflake=Snowflake -settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers. +settings.builtinBridgeSnowflakeDescription=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. settings.builtinBridgeMeekAzure=meek-azure -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. +settings.builtinBridgeMeekAzureDescription=Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow. +settings.bridgeButtonConnect=Connect +settings.bridgeButtonAccept=OK # Request bridges dialog settings.requestBridgeDialogTitle=Request Bridge View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/314794… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/314794… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f518efb1 by Dan Ballard at 2023-04-14T20:01:32+00:00 fixup! Add TorStrings module for localization Bug 41714: 'Show Fewer Bridges' button missing from refactored remove all bridges UI - - - - - 314794b1 by Dan Ballard at 2023-04-14T20:01:32+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41714: 'Show Fewer Bridges' button missing from refactored remove all bridges UI. Bug 41713: 'Remove All Bridges' button only appears after hitting 'Show All Bridges' - - - - - 3 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/modules/TorStrings.jsm Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -659,8 +659,11 @@ const gConnectionPane = (function() { const showAll = prefpane.querySelector(selectors.bridges.showAll); showAll.setAttribute("label", TorStrings.settings.bridgeShowAll); showAll.addEventListener("command", () => { - this._currentBridgesExpanded = true; + this._currentBridgesExpanded = !this._currentBridgesExpanded; this._populateBridgeCards(); + if (!this._currentBridgesExpanded) { + bridgeSwitch.scrollIntoView({ behavior: "smooth" }); + } }); const removeAll = prefpane.querySelector(selectors.bridges.removeAll); removeAll.setAttribute("label", TorStrings.settings.bridgeRemoveAll); @@ -673,17 +676,17 @@ const gConnectionPane = (function() { const newStrings = new Set(TorSettings.bridges.bridge_strings); const numBridges = newStrings.size; if (!newStrings.size) { - bridgeHeader.setAttribute("hidden", "true"); - bridgeDescription.setAttribute("hidden", "true"); - bridgeCards.setAttribute("hidden", "true"); - showAll.setAttribute("hidden", "true"); - removeAll.setAttribute("hidden", "true"); + bridgeHeader.hidden = true; + bridgeDescription.hidden = true; + bridgeCards.hidden = true; + showAll.hidden = true; + removeAll.hidden = true; bridgeCards.textContent = ""; return; } - bridgeHeader.removeAttribute("hidden"); - bridgeDescription.removeAttribute("hidden"); - bridgeCards.removeAttribute("hidden"); + bridgeHeader.hidden = false; + bridgeDescription.hidden = false; + bridgeCards.hidden = false; bridgeSwitch.checked = TorSettings.bridges.enabled; bridgeCards.classList.toggle("disabled", !TorSettings.bridges.enabled); bridgeCards.classList.toggle("single-card", numBridges === 1); @@ -729,22 +732,32 @@ const gConnectionPane = (function() { } // And finally update the buttons - if (numBridges > collapseThreshold && !this._currentBridgesExpanded) { - showAll.removeAttribute("hidden"); - if (TorSettings.bridges.enabled) { - showAll.classList.add("primary"); - } else { - showAll.classList.remove("primary"); - } - removeAll.setAttribute("hidden", "true"); - if (TorSettings.bridges.enabled) { - // We do not want both collapsed and disabled at the same time, - // because we use collapsed only to display a gradient on the list. - bridgeCards.classList.add("list-collapsed"); - } + removeAll.hidden = false; + showAll.classList.toggle("primary", TorSettings.bridges.enabled); + if (numBridges > collapseThreshold) { + showAll.hidden = false; + showAll.setAttribute( + "aria-expanded", + // Boolean value gets converted to string "true" or "false". + this._currentBridgesExpanded + ); + showAll.setAttribute( + "label", + this._currentBridgesExpanded + ? TorStrings.settings.bridgeShowFewer + : TorStrings.settings.bridgeShowAll + ); + // We do not want both collapsed and disabled at the same time, + // because we use collapsed only to display a gradient on the list. + bridgeCards.classList.toggle( + "list-collapsed", + !this._currentBridgesExpanded && TorSettings.bridges.enabled + ); } else { - showAll.setAttribute("hidden", "true"); - removeAll.removeAttribute("hidden"); + // NOTE: We do not expect the showAll button to have focus when we + // hide it since we do not expect `numBridges` to decrease whilst + // this button is focused. + showAll.hidden = true; bridgeCards.classList.remove("list-collapsed"); } }; ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -138,7 +138,8 @@ </vbox> <vbox id="torPreferences-currentBridges-cards"></vbox> <vbox align="center"> - <button id="torPreferences-currentBridges-showAll"/> + <button id="torPreferences-currentBridges-showAll" + aria-controls="torPreferences-currentBridges-cards"/> </vbox> <html:h2 id="torPreferences-addBridge-header"></html:h2> <hbox align="center"> ===================================== browser/modules/TorStrings.jsm ===================================== @@ -112,6 +112,7 @@ const Loader = { bridgeCopy: "Copy Bridge Address", copied: "Copied!", bridgeShowAll: "Show All Bridges", + bridgeShowFewer: "Show Fewer Bridges", allBridgesEnabled: "Use current bridges", bridgeRemoveAll: "Remove All Bridges", bridgeRemoveAllDialogTitle: "Remove all bridges?", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/adfc97… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/adfc97… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.0-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 77a7ec15 by Richard Pospesel at 2023-04-14T19:56:46+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "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.6", + "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.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "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.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "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.11", + "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.12", + "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.13", + "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.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "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.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "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:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "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/77a7ec1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/77a7ec1… You're receiving this email because of your account on gitlab.torproject.org.

1 0