January 2022 - tor-commits - lists.torproject.org

[tor/release-0.4.6] test: Remove HSv2 protover specific test
by dgoulet＠torproject.org 19 Jan '22

19 Jan '22

commit 986730e82c69d4a29e3b00cde5a7bf7a15a3b94b Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 19 13:36:23 2022 -0500 test: Remove HSv2 protover specific test HSv2 is not advertised as a supported protocol version anymore. This was introduced with the merge-forward of commit 72041c63064b461e which didn't fix the unit test. Fixes #40549 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_protover.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 44febe0fa6..16f0279871 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -348,9 +348,6 @@ test_protover_supports_version(void *arg) /* Deprecated HSIntro versions */ #define PROTOVER_HS_INTRO_DEPRECATED_1 1 #define PROTOVER_HS_INTRO_DEPRECATED_2 2 -/* Highest supported HSv2 introduce protocol version. - * It's not clear if we actually support version 2, see #25068. */ -#define PROTOVER_HS_INTRO_V2 3 /* HSv2 Rend and HSDir protocol versions. */ #define PROTOVER_HS_RENDEZVOUS_POINT_V2 1 @@ -433,12 +430,6 @@ test_protover_supported_protocols(void *arg) tt_assert(!protocol_list_supports_protocol(supported_protocols, PRT_HSINTRO, PROTOVER_HS_INTRO_DEPRECATED_2)); - /* We could test legacy HSIntro by calling rend_service_update_descriptor(), - * and checking the protocols field. But that's unlikely to change, so - * we just use a hard-coded value. */ - tt_assert(protocol_list_supports_protocol(supported_protocols, - PRT_HSINTRO, - PROTOVER_HS_INTRO_V2)); /* Test for HSv3 HSIntro */ tt_assert(protocol_list_supports_protocol(supported_protocols, PRT_HSINTRO,

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 19 Jan '22

19 Jan '22

commit 0f9967c9454bee18c5975b13c3e9bb5889e72e9d Merge: 4d60ab8fb7 986730e82c Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 19 13:56:43 2022 -0500 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_protover.c | 9 --------- 1 file changed, 9 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 19 Jan '22

19 Jan '22

commit 0f79d0b7572a0d0fed683fa86b08013674c9bd90 Merge: 9b423b07b7 0f9967c945 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 19 13:56:43 2022 -0500 Merge branch 'maint-0.4.6' into release-0.4.6 src/test/test_protover.c | 9 --------- 1 file changed, 9 deletions(-)

1 0

[tor-browser-bundle-testsuite/master] Fixed tests for Tor Browser 11/Firefox 91.
by richard＠torproject.org 19 Jan '22

19 Jan '22

commit b7bf572b77a1c355473204a79da912d2333e392f Author: Piero V <vogliadifarniente(a)gmail.com> Date: Fri Jan 7 12:49:02 2022 +0100 Fixed tests for Tor Browser 11/Firefox 91. Canged fp_navigator and fp_useragent to test with the correct version. The screen dimensions test was failing because letterboxing is disabled on about:pages (I checked with Richard, and this is the indended behavior). Therefore, the test is now run on a TPO page, and it passes. Updated the settings test, to check for new settings (see tor-browser!215), and not to check anymore for deprecated and removed settings (see tor-browser#40177). As a result of these settings changes, some DOM objects are now exposed: * pointer events * gamepads * applicationCache * visualViewport However, Tor Browser already contains mitigatins against their use for fingerprinting (e.g., gamepads do not work, Mozilla added some protections to pointer events for Bugzilla#1363508, letterboxing should prevent fingerprinting on visualViewport, cache storage is 0 bytes, etc...). Some other DOM objects are just new (e.g., clientInformation). Finally, HTTPS everywhere test failed because now Firefox redirects to HTTPS if available, even when HTTPS-Only Mode is not enabled. To detect if HTTPS everywhere is actually the responsible of the redirect, we need to run it with dom.security.https_first_pbm set to false. --- .../test_dom-objects-enumeration.py | 21 ++++++++-- marionette/tor_browser_tests/test_fp_navigator.py | 3 +- .../tor_browser_tests/test_fp_screen_dimensions.py | 2 + marionette/tor_browser_tests/test_fp_useragent.py | 3 +- .../tor_browser_tests/test_https-everywhere.py | 7 +++- marionette/tor_browser_tests/test_settings.py | 48 +++++++++++++++------- 6 files changed, 62 insertions(+), 22 deletions(-) diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index 26ff945..666e9b0 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -17,6 +17,7 @@ class Test(testsuite.TorBrowserTest): "AbortSignal", "AbstractRange", "addEventListener", + "applicationCache", "alert", "Animation", "AnimationEffect", @@ -61,6 +62,7 @@ class Test(testsuite.TorBrowserTest): "CharacterData", "clearInterval", "clearTimeout", + "clientInformation", "Clipboard", "ClipboardEvent", "close", @@ -368,6 +370,7 @@ class Test(testsuite.TorBrowserTest): "NotifyPaintEvent", "Number", "Object", + "OfflineResourceList", "onabort", "onabsolutedeviceorientation", "onafterprint", @@ -376,6 +379,7 @@ class Test(testsuite.TorBrowserTest): "onanimationiteration", "onanimationstart", "onauxclick", + "onbeforeinput", "onbeforeprint", "onbeforeunload", "onblur", @@ -387,10 +391,8 @@ class Test(testsuite.TorBrowserTest): "oncontextmenu", "oncuechange", "ondblclick", - "ondevicelight", "ondevicemotion", "ondeviceorientation", - "ondeviceproximity", "ondrag", "ondragend", "ondragenter", @@ -405,6 +407,9 @@ class Test(testsuite.TorBrowserTest): "onerror", "onfocus", "onformdata", + "ongamepadconnected", + "ongamepaddisconnected", + "ongotpointercapture", "onhashchange", "oninput", "oninvalid", @@ -417,6 +422,7 @@ class Test(testsuite.TorBrowserTest): "onloadedmetadata", "onloadend", "onloadstart", + "onlostpointercapture", "onmessage", "onmessageerror", "onmousedown", @@ -435,6 +441,14 @@ class Test(testsuite.TorBrowserTest): "onpause", "onplay", "onplaying", + "onpointercancel", + "onpointerdown", + "onpointerenter", + "onpointerleave", + "onpointermove", + "onpointerout", + "onpointerover", + "onpointerup", "onpopstate", "onprogress", "onratechange", @@ -459,7 +473,6 @@ class Test(testsuite.TorBrowserTest): "ontransitionstart", "onunhandledrejection", "onunload", - "onuserproximity", "onvolumechange", "onwaiting", "onwebkitanimationend", @@ -498,6 +511,7 @@ class Test(testsuite.TorBrowserTest): "personalbar", "Plugin", "PluginArray", + "PointerEvent", "PopStateEvent", "PopupBlockedEvent", "postMessage", @@ -713,6 +727,7 @@ class Test(testsuite.TorBrowserTest): "ValidityState", "valueOf", "VideoPlaybackQuality", + "visualViewport", "VisualViewport", "VTTCue", "VTTRegion", diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py index 91dc951..e976d85 100644 --- a/marionette/tor_browser_tests/test_fp_navigator.py +++ b/marionette/tor_browser_tests/test_fp_navigator.py @@ -56,7 +56,8 @@ class Test(MarionetteTestCase): app_version = "5.0 (Macintosh)" platform = "MacIntel" oscpu = "Intel Mac OS X 10.13" - nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0" + ua_ver = '91.0' + nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:" + ua_ver + ") Gecko/20100101 Firefox/" + ua_ver nav_props["appVersion"] = app_version nav_props["platform"] = platform nav_props["oscpu"] = oscpu diff --git a/marionette/tor_browser_tests/test_fp_screen_dimensions.py b/marionette/tor_browser_tests/test_fp_screen_dimensions.py index 2e0af6d..48de4d6 100644 --- a/marionette/tor_browser_tests/test_fp_screen_dimensions.py +++ b/marionette/tor_browser_tests/test_fp_screen_dimensions.py @@ -3,6 +3,8 @@ from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): def test_screen_dims(self): with self.marionette.using_context('content'): + self.marionette.navigate('https://check.torproject.org/') + # https://gitweb.torproject.org/torbrowser.git/blob/HEAD:/src/current-patches… js = self.marionette.execute_script # check that availWidth and availHeight are equal to window innerWidth and innerHeight diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py index 5b32bb3..13da933 100644 --- a/marionette/tor_browser_tests/test_fp_useragent.py +++ b/marionette/tor_browser_tests/test_fp_useragent.py @@ -15,5 +15,6 @@ class Test(MarionetteTestCase): ua_os = 'Windows NT 6.1; Win64; x64' if osname == 'MacOSX': ua_os = 'Macintosh; Intel Mac OS X 10.13' - self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0", + ua_ver = '91.0' + self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:" + ua_ver + ") Gecko/20100101 Firefox/" + ua_ver, js("return navigator.userAgent")) diff --git a/marionette/tor_browser_tests/test_https-everywhere.py b/marionette/tor_browser_tests/test_https-everywhere.py index 7819771..443c9a6 100644 --- a/marionette/tor_browser_tests/test_https-everywhere.py +++ b/marionette/tor_browser_tests/test_https-everywhere.py @@ -10,8 +10,8 @@ class Test(MarionetteTestCase): ts = testsuite.TestSuite() self.ts = ts - self.HTTP_URL = "http://httpbin.org/" - self.HTTPS_URL = "https://httpbin.org/" + self.HTTP_URL = "http://https-everywhere.badssl.com/redirect-test/status.svg" + self.HTTPS_URL = "https://https-everywhere.badssl.com/redirect-test/status.svg" self.is_disabled = self.ts.t['test']['name'] == 'https-everywhere-disabled' @@ -51,6 +51,9 @@ class Test(MarionetteTestCase): lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0) with self.marionette.using_context('content'): + # Even without HTTPS Everywhere, Firefox checks if HTTPS is + # available, with this set to true + self.marionette.set_pref('dom.security.https_first_pbm', False) self.marionette.navigate(self.HTTP_URL) if not self.is_disabled: diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py index f24cdd0..86dfe77 100644 --- a/marionette/tor_browser_tests/test_settings.py +++ b/marionette/tor_browser_tests/test_settings.py @@ -32,11 +32,13 @@ class Test(MarionetteTestCase): # Disk activity: Disable Browsing History Storage "browser.privatebrowsing.autostart": True, "browser.cache.disk.enable": False, - "browser.cache.offline.enable": False, "permissions.memory_only": True, "network.cookie.lifetimePolicy": 2, "security.nocertdb": True, + # Enabled LSNG + "dom.storage.next_gen": True, + # Disk activity: TBB Directory Isolation "browser.download.useDownloadDir": False, "browser.shell.checkDefaultBrowser": False, @@ -60,6 +62,9 @@ class Test(MarionetteTestCase): "datareporting.policy.dataSubmissionEnabled": False, "security.mixed_content.block_active_content": True, # Activated with bug #21323 + # Bug 40083: Make sure Region.jsm fetching is disabled + "browser.region.update.enabled": False, + # Make sure Unified Telemetry is really disabled, see: #18738. "toolkit.telemetry.unified": False, "toolkit.telemetry.enabled": True if ts.t["tbbinfos"]["version"].startswith("tbb-nightly") else False, @@ -75,10 +80,8 @@ class Test(MarionetteTestCase): "privacy.trackingprotection.pbmode.enabled": False, # Disable the Pocket extension (Bug #18886 and #31602) "extensions.pocket.enabled": False, - "network.http.referer.hideOnionSource": True, # Fingerprinting - "webgl.disable-extensions": True, "webgl.disable-fail-if-major-performance-caveat": True, "webgl.enable-webgl2": False, "gfx.downloadable_fonts.fallback_delay": -1, @@ -91,22 +94,38 @@ class Test(MarionetteTestCase): "privacy.resistFingerprinting.block_mozAddonManager": True, # Bug 26114 "dom.webaudio.enabled": False, # Bug 13017: Disable Web Audio API "dom.w3c_touch_events.enabled": 0, # Bug 10286: Always disable Touch API - "dom.w3c_pointer_events.enabled": False, "dom.vr.enabled": False, # Bug 21607: Disable WebVR for now # Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) "security.webauth.webauthn": False, # Bug 26614: Disable Web Authentication API for now + # Disable SAB, no matter if the sites are cross-origin isolated. + "dom.postMessage.sharedArrayBuffer.withCOOP_COEP": False, + "network.http.referer.hideOnionSource": True, + # Bug 40463: Disable Windows SSO + "network.http.windows-sso.enabled": False, + # Bug 40383: Disable new PerformanceEventTiming + "dom.enable_event_timing": False, + # Disable API for measuring text width and height. + "dom.textMetrics.actualBoundingBox.enabled": False, + "dom.textMetrics.baselines.enabled": False, + "dom.textMetrics.emHeight.enabled": False, + "dom.textMetrics.fontBoundingBox.enabled": False, + "pdfjs.enableScripting": False, # Third party stuff "network.cookie.cookieBehavior": 1, "privacy.firstparty.isolate": True, "network.http.spdy.allow-push": False, # Disabled for now. See https://bugs.torproject.org/27127 "network.predictor.enabled": False, # Temporarily disabled. See https://bugs.torproject.org/16633 + # Bug 40177: Make sure tracker cookie purging is disabled + "privacy.purge_trackers.enabled": False, # Proxy and proxy security "network.proxy.socks": "127.0.0.1", "network.proxy.socks_remote_dns": True, "network.proxy.no_proxies_on": "", # For fingerprinting and local service vulns (#10419) "network.proxy.type": 1, + # Bug 40548: Disable proxy-bypass + "network.proxy.failover_direct": False, "network.security.ports.banned": "9050,9051,9150,9151", "network.dns.disablePrefetch": True, "network.protocol-handler.external-default": False, @@ -118,7 +137,6 @@ class Test(MarionetteTestCase): "network.protocol-handler.warn-external.news": True, "network.protocol-handler.warn-external.nntp": True, "network.protocol-handler.warn-external.snews": True, - "plugin.state.flash": 0, "media.peerconnection.enabled": False, # Disable WebRTC interfaces # Disables media devices but only if `media.peerconnection.enabled` is set to # `false` as well. (see bug 16328 for this defense-in-depth measure) @@ -173,14 +191,14 @@ class Test(MarionetteTestCase): # extensions.enabledScopes is set to 5 by marionette_driver #"extensions.enabledScopes": 1, "extensions.pendingOperations": False, - "xpinstall.whitelist.add": "", - "xpinstall.whitelist.add.36": "", # We don't know what extensions Mozilla is advertising to our users and we # don't want to have some random Google Analytics script running either on the # about:addons page, see bug 22073 and 22900. "extensions.getAddons.showPane": False, # Bug 26114: Allow NoScript to access addons.mozilla.org etc. "extensions.webextensions.restrictedDomains": "", + # Don't give Mozilla-recommended third-party extensions special privileges. + "extensions.postDownloadThirdPartyPrompt": False, "dom.enable_resource_timing": False, @@ -190,16 +208,12 @@ class Test(MarionetteTestCase): # Enforce certificate pinning, see: https://bugs.torproject.org/16206 "security.cert_pinning.enforcement_level": 2, + # Don't load OS client certs. + "security.osclientcerts.autoload": False, + # Don't allow MitM via Microsoft Family Safety, see bug 21686 "security.family_safety.mode": 0, - # Disable the language pack signing check for now, see: bug 26465 - - # Avoid report TLS errors to Mozilla. We might want to repurpose this feature - # one day to help detecting bad relays (which is bug 19119). For now we just - # hide the checkbox, see bug 22072. - "security.ssl.errorReporting.enabled": False, - # Workaround for https://bugs.torproject.org/13579. Progress on # `about:downloads` is only shown if the following preference is set to `true` # in case the download panel got removed from the toolbar. @@ -211,7 +225,7 @@ class Test(MarionetteTestCase): # checking torbrowser.version match the version from the filename "torbrowser.version": ts.t["tbbinfos"]["version"], - "startup.homepage_override_url": "https://blog.torproject.org/category/tags/tor-browser", + "startup.homepage_override_url": "https://blog.torproject.org/category/applications", # Disable network information API everywhere # but, alas, the behavior is inconsistent across platforms, see: @@ -220,6 +234,10 @@ class Test(MarionetteTestCase): "dom.netinfo.enabled": False, } + MOZ_BUNDLED_FONTS = True + if MOZ_BUNDLED_FONTS: + self.SETTINGS["gfx.bundled-fonts.activate"] = 1 + # Settings for the Tor Browser 8.0 self.SETTINGS_80 = { }

1 0

[tor-browser-bundle-testsuite/master] Changed the IP address for the bridge test
by richard＠torproject.org 19 Jan '22

19 Jan '22

commit 0167631fd8a5737d9d6c21e1f5fa02e6c71bcff6 Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Mon Jan 10 17:31:51 2022 +0100 Changed the IP address for the bridge test The bridge test was not ending, because the bridge specified in the configuration was down. With this new bridge, the test passed as expected. --- tor-config/tor_bridge.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-config/tor_bridge.conf b/tor-config/tor_bridge.conf index 5d82115..23eb9eb 100644 --- a/tor-config/tor_bridge.conf +++ b/tor-config/tor_bridge.conf @@ -1,4 +1,4 @@ [% INCLUDE main_config %] UseBridges 1 -Bridge 35.170.192.213:12358 +Bridge 185.100.87.30:80 5B403DFE34F4872EB027059CECAE30B0C864B3A2

1 0

[tor-browser-bundle-testsuite/master] Bug 40033: Use Python 2 for the test virtual environment
by richard＠torproject.org 19 Jan '22

19 Jan '22

commit 1e53c8a9667e3d3f429b4473ce5af1794ab0a8f1 Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Mon Jan 17 09:32:31 2022 +0100 Bug 40033: Use Python 2 for the test virtual environment --- setup-virtualenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-virtualenv b/setup-virtualenv index f0c6288..9641ee1 100755 --- a/setup-virtualenv +++ b/setup-virtualenv @@ -42,7 +42,7 @@ if ($OSNAME eq 'cygwin') { } unless (-d $virtenv_marionette_dir) { - run($virtualenv_cmd, $virtenv_marionette_dir); + run($virtualenv_cmd, $virtenv_marionette_dir, '-p', 'python2'); # upgrade pip and setuptools run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip'); run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools');

1 0

[tor-browser-build/master] Bug 40419: Update namecoin-torbutton.patch
by gk＠torproject.org 19 Jan '22

19 Jan '22

commit 003cff75564f89d6764666198a92dc8d574745fa Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Jan 19 12:59:02 2022 +0100 Bug 40419: Update namecoin-torbutton.patch - Rebased patch to apply to torbutton after the tor-browser#40679 fix --- projects/firefox/namecoin-torbutton.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 5649ee6..4e92628 100644 --- a/projects/firefox/namecoin-torbutton.patch +++ b/projects/firefox/namecoin-torbutton.patch @@ -1,5 +1,5 @@ diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js -index 119f6fca..477b0302 100644 +index d6034384..120d32a0 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), @@ -118,7 +118,7 @@ index 119f6fca..477b0302 100644 // Hide the note about guards if we are using a bridge. document.getElementById("circuit-guard-note-container").style.display = -@@ -450,6 +491,7 @@ let setupDisplay = function (enablePrefName) { +@@ -454,6 +495,7 @@ let setupDisplay = function (enablePrefName) { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -126,7 +126,7 @@ index 119f6fca..477b0302 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -462,6 +504,9 @@ let setupDisplay = function (enablePrefName) { +@@ -466,6 +508,9 @@ let setupDisplay = function (enablePrefName) { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } @@ -136,11 +136,11 @@ index 119f6fca..477b0302 100644 myController = null; } }, -@@ -475,6 +520,7 @@ let setupDisplay = function (enablePrefName) { - stop(); - }); - syncDisplayWithSelectedTab(true); -+ stopCollectingBitTargets = collectBitTargets(myController); - stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); - stopCollectingBrowserCredentials = collectBrowserCredentials(); - stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); +@@ -474,6 +519,7 @@ let setupDisplay = function (enablePrefName) { + try { + myController = await wait_for_controller(); + syncDisplayWithSelectedTab(true); ++ stopCollectingBitTargets = collectBitTargets(myController); + stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); + stopCollectingBrowserCredentials = collectBrowserCredentials(); + stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions();

1 0

[tor-launcher/master] Bug 40679: Missing features on first-time launch in esr91
by gk＠torproject.org 19 Jan '22

19 Jan '22

commit d09cfa334a731e705568baf1cd75411b42db04fa Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Dec 17 16:59:48 2021 +0100 Bug 40679: Missing features on first-time launch in esr91 - updated tor controller connect calls to use torbutton's new async api - fixes tor-browser#40679 --- src/components/tl-protocol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index cdf5894..f5dddeb 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -775,7 +775,7 @@ TorProtocolService.prototype = var conn; try { const avoidCache = true; - conn = controller(e => { throw e; }, avoidCache); + conn = await controller(avoidCache); if (!aIsEventConnection && TorLauncherUtil.shouldStartAndOwnTor && !TorLauncherUtil.shouldOnlyConfigureTor)

1 0

[tor-launcher/master] Added extensions.torlauncher.launch_delay debug pref handling to simulate slow tor launch
by gk＠torproject.org 19 Jan '22

19 Jan '22

commit db7845b74fd1778acd1d2c4c68f724a27ca8ca69 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Dec 17 16:58:28 2021 +0100 Added extensions.torlauncher.launch_delay debug pref handling to simulate slow tor launch --- src/components/tl-process.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index d52dcda..51369a6 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -3,6 +3,8 @@ // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: +const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm") + const Cc = Components.classes; const Ci = Components.interfaces; const Cr = Components.results; @@ -41,6 +43,8 @@ TorProcessService.prototype = kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", kPrefDefaultBridgeType: "extensions.torlauncher.default_bridge_type", + // useful for simulating slow tor daemon launch + kPrefTorDaemonLaunchDelay: "extensions.torlauncher.launch_delay", kWizardProgressPageID: "progress", @@ -528,7 +532,17 @@ TorProcessService.prototype = for (var i = 0; i < args.length; ++i) TorLauncherLogger.log(2, " " + args[i]); - p.runwAsync(args, args.length, this, false); + const launchDelay = TorLauncherUtil.getIntPref(this.kPrefTorDaemonLaunchDelay, 0); + let runwAsync = () => p.runwAsync(args, args.length, this, false); + + if (launchDelay > 0) { + setTimeout(() => { + runwAsync(); + }, launchDelay); + } else { + runwAsync(); + } + this.mTorProcess = p; this.mTorProcessStartTime = Date.now(); }

1 0

[tor-browser/tor-browser-91.5.0esr-11.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 19 Jan '22

19 Jan '22

commit 2a8908bbdcbeb9aeec735e8a833a5650589653b9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 19 13:37:52 2022 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 29445428ee7c..a7f607351517 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 29445428ee7c1e033d00d9332983b895dccc052d +Subproject commit a7f6073515175a1f2d7a2bca1eaec2bfaff03c0c

1 0