- tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.0-android] Add missing Changelog entries
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 3a1199f4f2bb6d28f210ed6b3a88ee9d2d96c6d1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 21:51:21 2021 +0000 Add missing Changelog entries --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1c59fb2..23c9e2b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -127,6 +127,8 @@ Tor Browser 10.0.5 -- November 27 2020 * Update Fenix to 83.1.0 * Update Tor to 0.4.4.6 * Translations update + * Bug 40152: Top Crash: android.database.sqlite.SQLiteConstraintException [tor-browser-build] + * Bug 40205: Replace occurrence of EmptyCString with 0-length _ns literal [tor-browser] * Bug 40212: Add new default bridge [tor-browser] * Build System * Android

1 0

[tor-browser-build/master] Add some missing ChangeLog entries
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit f78a258e3fc802d0616d5ffbf972dd6e341799d1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 21:49:41 2021 +0000 Add some missing ChangeLog entries --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ee59894..cdbeba9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -36,6 +36,7 @@ Tor Browser 10.0.18 -- June 16 2021 Tor Browser 10.5a16 -- June 5 2021 * All Platforms + * Update HTTPS Everywhere to 2021.4.15 * Update NoScript to 11.2.8 * Update Tor to 0.4.6.4-rc * Bug 40432: Prevent probing installed applications [tor-browser] @@ -470,6 +471,8 @@ Tor Browser 10.0.5 -- November 27 2020 * Android * Update Fenix to 83.1.0 * Translations update + * Bug 40152: Top Crash: android.database.sqlite.SQLiteConstraintException [tor-browser-build] + * Bug 40205: Replace occurrence of EmptyCString with 0-length _ns literal [tor-browser] * Build System * Android * Bug 40126: Update toolchains for Fenix 83 [tor-browser-build]

1 0

[tor-browser-build/master] Add 10.0 changelog entries
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 0d9cd5c944af6bed6d60d65887d1560686bdb808 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 20:49:31 2021 +0000 Add 10.0 changelog entries --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9c94409..ee59894 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -16,6 +16,24 @@ Tor Browser 10.5a17 -- June 27 2021 * Android * Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies [tor-browser-build] +Tor Browser 10.0.18 -- June 16 2021 + * All Platforms + * Update Tor to 0.4.5.9 + * Android + * Update Fenix to 89.1.1 + * Update NoScript to 11.2.8 + * Bug 40055: Rebase android-componets patches on 75.0.22 for Fenix 89 [android-components] + * Bug 40165: Announce v2 onion service deprecation on about:tor [fenix] + * Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray [fenix] + * Bug 40167: Hide "Save to Collection" in menu [fenix] + * Bug 40169: Rebase fenix patches to fenix v89.1.1 [fenix] + * Bug 40170: Error building tor-browser-89.1.1-10.5-1 [fenix] + * Bug 40432: Prevent probing installed applications [tor-browser] + * Bug 40470: Rebase 10.0 patches onto 89.0 [tor-browser] + * Build System + * Android + * Bug 40290: Update components for mozilla89-based Fenix [tor-browser-build] + Tor Browser 10.5a16 -- June 5 2021 * All Platforms * Update NoScript to 11.2.8 @@ -39,6 +57,16 @@ Tor Browser 10.5a16 -- June 5 2021 * Android * Bug 40290: Update components for mozilla89-based Fenix [tor-browser-build] +Tor Browser 10.0.17 -- June 1 2021 + * Windows + OS X + Linux + * Update Firefox to 78.11.0esr + * Update HTTPS Everywhere to 2021.4.15 + * Update NoScript to 11.2.8 + * Update Tor to 0.4.5.8 + * Bug 27002: (Mozilla 1673237) Always allow SVGs on about: pages [tor-browser] + * Bug 40432: Prevent probing installed applications [tor-browser] + * Bug 40037: Announce v2 onion service deprecation on about:tor [torbutton] + Tor Browser 10.5a15 -- April 23 2021 * All Platforms * Update Tor to 0.4.6.2-alpha @@ -56,6 +84,22 @@ Tor Browser 10.5a15 -- April 23 2021 * Android * Bug 40259: Update components for mozilla88-based Fenix [tor-browser-build] +Tor Browser 10.0.16 -- May 7 2021 + * Android + * Update Fenix to 88.1.3 + * Update HTTPS Everywhere to 2021.4.15 + * Update NoScript to 11.2.6 + * Translations update + * Bug 40052: Rebase android-components patches for Fenix 88 [android-components] + * Bug 40162: Disable Numbus experiments [fenix] + * Bug 40163: Rebase Fenix patches to Fenix 88.1.3 [fenix] + * Bug 40423: Disable http/3 [tor-browser] + * Bug 40425: Rebase 10.5 patches on 88.0.1 [tor-browser] + * Build System + * Android + * Bug 40259: Update components for mozilla88-based Fenix [tor-browser-build] + * Bug 40293: Patch app-services' vendored uniffi_bindgen [tor-browser-build] + Tor Browser 10.0.16 -- April 20 2021 * Windows + OS X + Linux * Update Firefox to 78.10.0esr

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit b0c9aa0139e57a290b387942c461e2ae1b1a9bec Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 29 15:43:36 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/themes/shared/onionPattern.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/themes/shared/onionPattern.css b/browser/themes/shared/onionPattern.css index ac1af7b8d65e..c605a4b4f59e 100644 --- a/browser/themes/shared/onionPattern.css +++ b/browser/themes/shared/onionPattern.css @@ -19,6 +19,8 @@ display: flex; justify-content: center; overflow-x: hidden; + pointer-events: none; /* for some reason, elements with overflow-x: hidden set become focusable */ + margin: 0 auto; } @@ -28,6 +30,7 @@ height: calc((2 + var(--sqrt3)) * var(--onion-radius, 50px)); /* room for 2 rows of circles */ flex-shrink: 0; overflow-x: hidden; /* clip extra circles on the sides */ + pointer-events: none; /* for some reason, elements with overflow-x: hidden set become focusable */ } .onion-pattern-row {

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40495' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 85ca6e359d6b8d3eb21d4777359a004aec978ba2 Merge: 5488b6499042 b0c9aa0139e5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 19:43:16 2021 +0000 Merge remote-tracking branch 'richardgl/40495' into tor-browser-78.11.0esr-10.5-1 browser/themes/shared/onionPattern.css | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit fc22d11226d7be2dfd16f10eb8d7b939ae6cccd1 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 29 14:43:22 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/base/content/aboutNetError.js | 5 +-- browser/components/BrowserGlue.jsm | 22 ++++++---- browser/components/torconnect/TorConnectParent.jsm | 11 ----- browser/modules/TorConnect.jsm | 47 ++++++++++++++++++++++ browser/modules/moz.build | 1 + toolkit/mozapps/update/UpdateService.jsm | 43 ++++++++++++++++++++ toolkit/xre/nsAppRunner.cpp | 7 +--- 7 files changed, 108 insertions(+), 28 deletions(-) diff --git a/browser/base/content/aboutNetError.js b/browser/base/content/aboutNetError.js index b85ba74217cb..6844154e16e3 100644 --- a/browser/base/content/aboutNetError.js +++ b/browser/base/content/aboutNetError.js @@ -198,11 +198,8 @@ async function initPage() { var err = getErrorCode(); // proxyConnectFailure because no-tor running daemon would return this error - // netOffline because we do not want to show the offline page (where users can disable offline-mode) - // when we are 'offline' (offline mode is disabled after successful bootstrapping in - // TorConnectParent) if ( - (err === "proxyConnectFailure" || err === "netOffline") && + (err === "proxyConnectFailure") && (await RPMSendQuery("ShouldShowTorConnect")) ) { document.location.replace("about:torconnect"); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index adc8e5edb07a..7c832f62386e 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -17,6 +17,14 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + +const { TorConnect } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" +); + ChromeUtils.defineModuleGetter( this, "ActorManagerParent", @@ -2506,23 +2514,23 @@ BrowserGlue.prototype = { { task: () => { - if (Services.io.offline === false) { + if (TorProtocolService.isBootstrapDone()) { // we will take this path when the user is using the legacy tor launcher OnionAliasStore.init(); } else { - // this path is taken when using about:torconnect, we start in offline mode - // and only switch to online after bootstrapping completes - const topic = "network:offline-status-changed"; - let offlineStatusChangedObserver = { + // this path is taken when using about:torconnect, we wait to init + // after we are bootstrapped and connected to tor + const topic = "torconnect:bootstrap-complete"; + let bootstrapObserver = { observe(aSubject, aTopic, aData) { - if (aTopic === topic && aData === "online") { + if (aTopic === topic) { OnionAliasStore.init(); // we only need to init once, so remove ourselves as an obvserver Services.obs.removeObserver(this, topic); } } }; - Services.obs.addObserver(offlineStatusChangedObserver, topic); + Services.obs.addObserver(bootstrapObserver, topic); } }, }, diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index cd574ada4da1..f775507a744f 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -45,17 +45,6 @@ class TorConnectParent extends JSWindowActorParent { obj.handled = true; } self.sendAsyncMessage(aTopic, obj); - - // we need to tell the IOService that we are not online - // setting offline to false will make the io service send out - // 'network:offline-status-changed' message to observers - // the app updater (among other things) listens for this message - // and will attempt to check for updates when receiving this message - // to recover from a previously failed attempt - if (aTopic === kTorBootstrapStatusTopic && - obj.PROGRESS === 100) { - Services.io.offline = false; - } }, }; diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm new file mode 100644 index 000000000000..2b8cd15e3b62 --- /dev/null +++ b/browser/modules/TorConnect.jsm @@ -0,0 +1,47 @@ +"use strict"; + +var EXPORTED_SYMBOLS = ["TorConnect"]; + +const { Services } = ChromeUtils.import( + "resource://gre/modules/Services.jsm" +); + +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + +// TODO: move the bootstrap state management out of each of the individual +// about:torconnect pages and stick it here +var TorConnect = (() => { + let retval = { + init : function() { + let topics = [ + "TorBootstrapStatus", + ]; + + for(const topic of topics) { + Services.obs.addObserver(this, topic); + } + }, + + observe: function(subject, topic, data) { + switch(topic) { + case "TorBootstrapStatus": + const obj = subject?.wrappedJSObject; + if (obj?.PROGRESS === 100) { + Services.obs.notifyObservers(null, "torconnect:bootstrap-complete"); + } + break; + default: + // ignore + break; + } + }, + + shouldShowTorConnect : function() { + return TorProtocolService.shouldShowTorConnect(); + }, + }; + retval.init(); + return retval; +})(); /* TorConnect */ \ No newline at end of file diff --git a/browser/modules/moz.build b/browser/modules/moz.build index f2c9dabdddbe..7f091e0e7711 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -155,6 +155,7 @@ EXTRA_JS_MODULES += [ 'TabUnloader.jsm', 'ThemeVariableMap.jsm', 'TopSiteAttribution.jsm', + 'TorConnect.jsm', 'TorProcessService.jsm', 'TorProtocolService.jsm', 'TorStrings.jsm', diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 1fb397373151..5bd778ce47e2 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -12,6 +12,11 @@ const { AppConstants } = ChromeUtils.import( const { AUSTLMY } = ChromeUtils.import( "resource://gre/modules/UpdateTelemetry.jsm" ); + +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + const { Bits, BitsRequest, @@ -201,6 +206,7 @@ const INVALID_UPDATER_STATUS_CODE = 99; // Custom update error codes const BACKGROUNDCHECK_MULTIPLE_FAILURES = 110; const NETWORK_ERROR_OFFLINE = 111; +const PROXY_SERVER_CONNECTION_REFUSED = 2152398920; // Error codes should be < 1000. Errors above 1000 represent http status codes const HTTP_ERROR_OFFSET = 1000; @@ -2220,6 +2226,9 @@ UpdateService.prototype = { case "network:offline-status-changed": this._offlineStatusChanged(data); break; + case "torconnect:bootstrap-complete": + this._bootstrapComplete(); + break; case "nsPref:changed": if (data == PREF_APP_UPDATE_LOG || data == PREF_APP_UPDATE_LOG_FILE) { gLogEnabled; // Assigning this before it is lazy-loaded is an error. @@ -2640,6 +2649,35 @@ UpdateService.prototype = { this._attemptResume(); }, + _registerBootstrapObserver: function AUS__registerBootstrapObserver() { + if (this._registeredBootstrapObserver) { + LOG( + "UpdateService:_registerBootstrapObserver - observer already registered" + ); + return; + } + + LOG( + "UpdateService:_registerBootstrapObserver - waiting for tor bootstrap to " + + "be complete, then forcing another check" + ); + + Services.obs.addObserver(this, "torconnect:bootstrap-complete"); + this._registeredBootstrapObserver = true; + }, + + _bootstrapComplete: function AUS__bootstrapComplete() { + Services.obs.removeObserver(this, "torconnect:bootstrap-complete"); + this._registeredBootstrapObserver = false; + + LOG( + "UpdateService:_bootstrapComplete - bootstrapping complete, forcing " + + "another background check" + ); + + this._attemptResume(); + }, + onCheckComplete: function AUS_onCheckComplete(request, updates) { this._selectAndInstallUpdate(updates); }, @@ -2659,6 +2697,11 @@ UpdateService.prototype = { AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_OFFLINE); } return; + } else if (update.errorCode == PROXY_SERVER_CONNECTION_REFUSED && + !TorProtocolService.isBootstrapDone()) { + // Register boostrap observer to try again + this._registerBootstrapObserver(); + return; } // Send the error code to telemetry diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 6c8105939fcb..195b3637ca78 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2984,7 +2984,7 @@ bool fire_glxtest_process(); class XREMain { public: XREMain() - : mStartOffline(true), + : mStartOffline(false), mShuttingDown(false) #ifdef MOZ_HAS_REMOTE , @@ -3588,11 +3588,6 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { CheckArg("new-instance"); #endif - // revert to start online behaviour when using the legacy tor launcher - if (EnvHasValue("TOR_USE_LEGACY_LAUNCHER")) { - mStartOffline = false; - } - ar = CheckArg("offline"); if (ar || EnvHasValue("XRE_START_OFFLINE")) { mStartOffline = true;

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40490' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 5488b6499042b74a36b7aafec2b4b2e755ef4390 Merge: 19d57bc2c04e fc22d11226d7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 19:32:53 2021 +0000 Merge remote-tracking branch 'richardgl/40490' into tor-browser-78.11.0esr-10.5-1 browser/base/content/aboutNetError.js | 5 +-- browser/components/BrowserGlue.jsm | 22 ++++++---- browser/components/torconnect/TorConnectParent.jsm | 11 ----- browser/modules/TorConnect.jsm | 47 ++++++++++++++++++++++ browser/modules/moz.build | 1 + toolkit/mozapps/update/UpdateService.jsm | 43 ++++++++++++++++++++ toolkit/xre/nsAppRunner.cpp | 7 +--- 7 files changed, 108 insertions(+), 28 deletions(-)

1 0

[tor-browser-build/master] Revert "fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal"
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit c7e16bb784a74733549cbcbcedb87b85c550cb9b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 17:54:15 2021 +0000 Revert "fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal" This reverts commit 215c74866903946fa75fe369108562506fcfe5ba. --- projects/tor-browser/build | 11 +++++++++-- projects/tor-browser/config | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d2b8482..1d2e35b 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -48,7 +48,9 @@ MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] -tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% IF c("var/snowflake") %] + tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% END -%] tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] @@ -133,7 +135,12 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% IF ! c("var/snowflake") %] + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> "$GENERATEDPREFSPATH" +[% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% END %] [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1045d90..f98062e 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% ! c("var/android") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] squash! Bug 26961: New user onboarding.
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 19d57bc2c04eed2290354024d9eb4b08779a7b41 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 17:37:11 2021 +0000 squash! Bug 26961: New user onboarding. Bug 40429: Update Onboarding for 10.5 --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 9f51fb4bd28a..99ec2b45d35f 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -909,7 +909,7 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo - const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/"; + const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-5/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon":

1 0

[tor-browser-build/master] fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal
by sysrqb＠torproject.org 30 Jun '21

30 Jun '21

commit 215c74866903946fa75fe369108562506fcfe5ba Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 30 17:34:12 2021 +0000 fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal --- projects/tor-browser/build | 11 ++--------- projects/tor-browser/config | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 1d2e35b..d2b8482 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -48,9 +48,7 @@ MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] -[% IF c("var/snowflake") %] - tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] -[% END -%] +tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] @@ -135,12 +133,7 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF ! c("var/snowflake") %] - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" -[% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" -[% END %] +cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f98062e..1045d90 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") && ! c("var/android") %]' + enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…

1 0