- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-83.0-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 01 Dec '20

01 Dec '20

commit cc3f3dc643124975e0c298363542d26a52e45cba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 30 07:54:38 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d71c858844e3..c50c57d410de 100755 --- a/.mozconfig +++ b/.mozconfig @@ -14,6 +14,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-android b/.mozconfig-android index 1b5e3f3178b7..50015ec615ef 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -3,6 +3,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Android diff --git a/.mozconfig-asan b/.mozconfig-asan index ca05fb12eedb..e42ff6c86bc5 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -22,6 +22,7 @@ ac_add_options --disable-jemalloc ac_add_options --disable-elf-hack ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-mac b/.mozconfig-mac index 9be7751f8241..5b4624ef1f67 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,6 +38,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 29c58d8fdab2..ce6ace1dad67 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -10,6 +10,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[tor-browser/tor-browser-78.5.0esr-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by sysrqb＠torproject.org 01 Dec '20

01 Dec '20

commit 7a73628afb1c48d48e1b272382f4a51728ef00aa Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 30 07:54:38 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d71c858844e3..c50c57d410de 100755 --- a/.mozconfig +++ b/.mozconfig @@ -14,6 +14,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-android b/.mozconfig-android index 1b5e3f3178b7..50015ec615ef 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -3,6 +3,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Android diff --git a/.mozconfig-asan b/.mozconfig-asan index a1c4e467cf1a..8bee813bfee8 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -23,6 +23,7 @@ ac_add_options --disable-elf-hack ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-mac b/.mozconfig-mac index 9be7751f8241..5b4624ef1f67 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,6 +38,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 29c58d8fdab2..ce6ace1dad67 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -10,6 +10,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[Git][tpo/applications/android-components][android-components-67.0.3-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel 30 Nov '20

30 Nov '20

Matthew Finkel pushed to branch android-components-67.0.3-10.5-1 at The Tor Project / Applications / android-components Commits: 06756bca by Matthew Finkel at 2020-11-24T03:25:27+00:00 Bug 40005: Modify Default toolbar menu - - - - - eb9893c8 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 32b72c67 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40002: Ensure system download manager is not used - - - - - ed46fc32 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - e708c980 by Alex Catarineu at 2020-11-24T17:11:42+00:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - e1eaf261 by Georg Koppen at 2020-11-24T17:14:11+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 481298d9 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40015: Port padlock states for .onion services - - - - - 77d94719 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - be77ed01 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - d3936b47 by Matthew Finkel at 2020-11-24T17:14:11+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - dbed701b by Matthew Finkel at 2020-11-24T17:14:53+00:00 Bug 40023: Stop PrivateNotificationService - - - - - a5b3a15a by Matthew Finkel at 2020-11-24T17:16:49+00:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenu.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.5.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 719c1743fe8a972bec265cc84819c988ed399959 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 26 20:53:52 2020 +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 76ad489a71fe..4a258f4216e0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 76ad489a71fe319065055f1e61fcf83bb9b3cdc2 +Subproject commit 4a258f4216e0adfa65a60f89183c3441ac2e83f8

1 0

[torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/27'
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 4a258f4216e0adfa65a60f89183c3441ac2e83f8 Merge: 76ad489a 227e9f25 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 26 20:49:27 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/27' chrome/content/torbutton.js | 203 +------------------------------------------- 1 file changed, 2 insertions(+), 201 deletions(-)

1 0

[torbutton/master] Bug 40024: Rip out remnants of Torbutton's internal version check
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 227e9f2503e0d300a2fc4072c4d5c9f570398ebb Author: Rusty Bird <rustybird(a)net-c.com> Date: Thu Nov 26 17:59:59 2020 +0000 Bug 40024: Rip out remnants of Torbutton's internal version check Since Tor Browser 9.0 (when the Onion Button was removed), Torbutton's internal browser version check is no longer hooked up to any UI. But it was still chugging along - making requests and logging to the Browser Console. Delete it, along with some now unnecessary support code. --- chrome/content/torbutton.js | 203 +------------------------------------------- 1 file changed, 2 insertions(+), 201 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index d795f642..db597c84 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -30,9 +30,6 @@ let { } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); -const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; -const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; -const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; var m_tb_prefs = Services.prefs; @@ -65,33 +62,6 @@ async function clearData(flags) { }); } -// Bug 1506 P1: This object is only for updating the UI for toggling and style -var torbutton_window_pref_observer = -{ - register: function() - { - m_tb_prefs.addObserver("extensions.torbutton", this, false); - }, - - unregister: function() - { - m_tb_prefs.removeObserver("extensions.torbutton", this); - }, - - // topic: what event occurred - // subject: what nsIPrefBranch we're observing - // data: which pref has been changed (relative to subject) - observe: function(subject, topic, data) - { - if (topic != "nsPref:changed") return; - switch (data) { - case k_tb_browser_update_needed_pref: - torbutton_notify_if_update_needed(); - break; - } - } -} - // Bug 1506 P2: This object keeps Firefox prefs in sync with Torbutton prefs. // It probably could stand some simplification (See #3100). It also belongs // in a component, not the XUL overlay. @@ -242,32 +212,6 @@ torbutton_init = function() { } m_tb_wasinited = true; - // Determine if we are running inside Tor Browser. - var cur_version; - try { - cur_version = m_tb_prefs.getCharPref("torbrowser.version"); - torbutton_log(3, "This is a Tor Browser"); - } catch(e) { - torbutton_log(3, "This is not a Tor Browser: "+e); - } - - // If the Tor Browser version has changed since the last time Torbutton - // was loaded, reset the version check preferences in order to avoid - // incorrectly reporting that the browser needs to be updated. - var last_version; - try { - last_version = m_tb_prefs.getCharPref(k_tb_last_browser_version_pref); - } catch (e) {} - if (cur_version != last_version) { - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - if (m_tb_prefs.prefHasUserValue(k_tb_last_update_check_pref)) { - m_tb_prefs.clearUserPref(k_tb_last_update_check_pref); - } - - if (cur_version) - m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); - } - let tlps; try { tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] @@ -347,14 +291,10 @@ torbutton_init = function() { // listen for our toolbar button being added so we can initialize it torbutton_init_toolbutton(); - torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); - torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); torbutton_update_toolbutton(); - torbutton_notify_if_update_needed(); try { createTorCircuitDisplay("extensions.torbutton.display_circuit"); @@ -505,128 +445,6 @@ function torbutton_get_toolbutton() { return o_toolbutton; } -function torbutton_update_is_needed() { - var updateNeeded = false; - try { - updateNeeded = m_tb_prefs.getBoolPref(k_tb_browser_update_needed_pref); - } catch (e) {} - - return updateNeeded; -} - -function torbutton_notify_if_update_needed() { - function setOrClearAttribute(aElement, aAttrName, aValue) - { - if (!aElement || !aAttrName) - return; - - if (aValue) - aElement.setAttribute(aAttrName, aValue); - else - aElement.removeAttribute(aAttrName); - } - - let updateNeeded = torbutton_update_is_needed(); - - // Change look of toolbar item (enable/disable animated update icon). - var btn = torbutton_get_toolbutton(); - setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); - - // Make the "check for update" menu item bold if an update is needed. - var item = document.getElementById("torbutton-checkForUpdate"); - setOrClearAttribute(item, "tbUpdateNeeded", updateNeeded); -} - -// Bug 1506 P4: Checking for Tor Browser updates is pretty important, -// probably even as a fallback if we ever do get a working updater. -function torbutton_do_async_versioncheck() { - if (!m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { - return; - } - - // Suppress update check if done recently. - const kMinSecsBetweenChecks = 120 * 60; // 2.0 hours - var now = Date.now() / 1000; - var lastCheckTime; - try { - lastCheckTime = parseFloat(m_tb_prefs.getCharPref(k_tb_last_update_check_pref)); - if (isNaN(lastCheckTime)) - lastCheckTime = undefined; - } catch (e) {} - - if (lastCheckTime && ((now - lastCheckTime) < kMinSecsBetweenChecks)) - return; - - m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now); - - torbutton_log(3, "Checking version with socks port: " - +m_tb_prefs.getIntPref("network.proxy.socks_port")); - try { - var req = new XMLHttpRequest(); - var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); - req.open('GET', url, true); - req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; - req.overrideMimeType("text/json"); - req.onreadystatechange = function (oEvent) { - if (req.readyState === 4) { - if(req.status == 200) { - if(!req.responseText) { - torbutton_log(5, "Version check failed! No JSON present!"); - return -1; - } - try { - var version_list = JSON.parse(req.responseText); - var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - var platformSuffix; - var platform = Services.appinfo.OS; - switch (platform) { - case "WINNT": - platformSuffix = "Windows"; - break; - case "Darwin": - platformSuffix = "MacOS"; - break; - case "Linux": - case "Android": - platformSuffix = platform; - break; - } - if (platformSuffix) - my_version += "-" + platformSuffix; - - if (version_list.indexOf(my_version) >= 0) { - torbutton_log(3, "Version check passed."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - return; - } - torbutton_log(5, "Your Tor Browser is out of date."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true); - return; - } catch(e) { - torbutton_log(5, "Version check failed! JSON parsing error: "+e); - return; - } - } else if (req.status == 404) { - // We're going to assume 404 means the service is not implemented yet. - torbutton_log(3, "Version check failed. Versions file is 404."); - return -1; - } - torbutton_log(5, "Version check failed! Web server error: "+req.status); - return -1; - } - }; - req.send(null); - } catch(e) { - if(e.result == 0x80004005) { // NS_ERROR_FAILURE - torbutton_log(5, "Version check failed! Is tor running?"); - return -1; - } - torbutton_log(5, "Version check failed! Tor internal error: "+e); - return -1; - } - -} - function torbutton_update_toolbutton() { let o_toolbutton = torbutton_get_toolbutton(); @@ -1625,16 +1443,6 @@ function torbutton_do_startup() } } -// Perform version check when a new tab is opened. -function torbutton_new_tab(event) -{ - // listening for new tabs - torbutton_log(3, "New tab"); - - /* Perform the version check on new tab, module timer */ - torbutton_do_async_versioncheck(); -} - // Bug 1506 P3: Used to decide if we should resize the window. // // Returns true if the window wind is neither maximized, full screen, @@ -1705,9 +1513,8 @@ function setupPreferencesForMobile() { }); } -// Bug 1506 P3: This is needed pretty much only for the version check -// and the window resizing. See comments for individual functions for -// details +// Bug 1506 P3: This is needed pretty much only for the window resizing. +// See comments for individual functions for details function torbutton_new_window(event) { torbutton_log(3, "New window"); @@ -1721,8 +1528,6 @@ function torbutton_new_window(event) if (!m_tb_wasinited) { torbutton_init(); } - // Add tab open listener.. - browser.tabContainer.addEventListener("TabOpen", torbutton_new_tab, false); torbutton_do_startup(); @@ -1734,16 +1539,12 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } - // Check the version on every new window. We're already pinging check in these cases. - torbutton_do_async_versioncheck(); - torbutton_do_tor_check(); } // Bug 1506 P2: This is only needed because we have observers // in XUL that should be in an XPCOM component function torbutton_close_window(event) { - torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); window.removeEventListener("sizemodechange", m_tb_resize_handler,

1 0

[tor-browser-build/maint-10.0-android] Add new default obfs4 bridge.
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 60d03f5bd24da3e3a141dd5da2f53c829c06a7d4 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 4 10:18:29 2020 -0800 Add new default obfs4 bridge. Louis-Philippe Véronneau generously set up this bridge for us. David Goulet mentions that this bridge runs in the same autonomous system (and data centre) as his default bridge. This patch partially fixes tpo/applications/tor-browser#40212 --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index f3202c0..c414212 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 209.148.46.65:443 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "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", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-10.0-android] Bug 40127: Update GeckoView 83 dependencies
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 82fae194b21e9801726265f1e6a7e57ed21eec5d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 23 10:45:39 2020 +0000 Bug 40127: Update GeckoView 83 dependencies --- projects/geckoview/config | 4 ++-- projects/geckoview/gradle-dependencies-list.txt | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 67c8986..35d19d4 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 82.0.3 + geckoview_version: 83.0 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -25,7 +25,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 steps: merge_aars: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 96d2e45..805b1aa 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -330,6 +330,10 @@ e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8 | https://maven a000041f5a1f79283c5175e1bb60cf3683780f401c6a9d34fbe9751253fa6ff9 | https://maven.google.com/androidx/localbroadcastmanager/localbroadcastmanag… b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.aar 9cdfe5f7849069ad84dc4fb0407b3677fb8c22d3d66fd2b8fdb8dec8c5dc7411 | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.pom +fb8115694b1731c23c1bbb628f5baaee37a8f3b50d69a7733b55278e101e1488 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/m… +5056524d08992ebe1b3654c5b0db125497b930f177fa385952450e3b74d49bf2 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/m… +c01700091072e0ff5d8ec2d00eac6b8f96ea18646080425e9ce3c6a7b5f66e33 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.aar +4298222d2a10cf6e82f32650b5a716a8714899f3ef7d05d58ddaafc32ae2d614 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.pom 6054ee0184ba0ffd66dc825e060e8c9bf2f6c2ea54336cf3bef15c575037a743 | https://maven.google.com/androidx/palette/palette/1.0.0/palette-1.0.0.aar 85c5599135a789cfd5f99656f9e8240c9a727f72b2caaab60943aa32bb842771 | https://maven.google.com/androidx/palette/palette/1.0.0/palette-1.0.0.pom ea9fde25606eb456210ffe9f7e51048abd776b55a34c0cc6608282b5699122d1 | https://maven.google.com/androidx/preference/preference/1.0.0/preference-1.… @@ -479,6 +483,14 @@ c7786e12c89c77e4daea2ebb991491821f90364cd5e06a02b56371a42084b3c0 | https://maven 7031d2d09683996ac126074be3de6df9b3de80f7e0f10b80a6e8754f69c80028 | https://maven.google.com/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom ebec9d8e0a140b376aade276b08572cb1f8cf954249b469bee6dce6fd5a45cd4 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.jar 768b365f2486e344d012d5b4b9b195fde8bfb442c23dca89d258a7766cdba5c8 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.pom +dd0980edf729e0d346e2b58e70801dc237c1aed0c7ab274fa3f1c8c8efc64cc7 | https://maven.google.com/com/google/android/gms/play-services-base/17.0.0/p… +c30489d38be5d41e19272f6aa47d6c43de85034500bcb1864b79381c9634d924 | https://maven.google.com/com/google/android/gms/play-services-base/17.0.0/p… +d324a1785bbc48bfe3639fc847cfd3cf43d49e967b5caf2794240a854557a39c | https://maven.google.com/com/google/android/gms/play-services-basement/17.0… +ffe9295d9eb2ec2d784bb4c3634f6a10175224d2111332fa2735320b52a24b66 | https://maven.google.com/com/google/android/gms/play-services-basement/17.0… +85ca0babd7fa3aa3454203105a32836615ac44c59c59e2452bb548c873c4ca44 | https://maven.google.com/com/google/android/gms/play-services-fido/18.1.0/p… +feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven.google.com/com/google/android/gms/play-services-fido/18.1.0/p… +2e6d1738b73647f3fe7a038b9780b97717b3746eae258009197e36e7bf3112a5 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… +fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… 7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | https://maven.google.com/com/google/android/material/material/1.0.0/materia… c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/materia… ece749bdea04522b04a7b0cfd391026f88808c4d0103b3bede8b42baf0b7d677 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3…

1 0

[tor-browser-build/maint-10.0-android] Bug 40126: Bump Node to 10.22.1 for mozilla83
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 1fe1df5aa862d12f82ed09f7fcd778a85cfca849 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 23 07:36:14 2020 +0000 Bug 40126: Bump Node to 10.22.1 for mozilla83 We adapt the download path, too, to the one Mozilla is using. --- projects/node/build | 2 +- projects/node/config | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/projects/node/build b/projects/node/build index 8cc8ea5..4a437be 100644 --- a/projects/node/build +++ b/projects/node/build @@ -11,7 +11,7 @@ [% END -%] distdir=/var/tmp/dist/[% project %] tar -xf [% c('input_files_by_name/node') %] -cd node-[% c('version') %] +cd node-v[% c('version') %] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index b3534f4..55f8965 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,10 +1,18 @@ # vim: filetype=yaml sw=2 -version: v10.21.0 +version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: + node_version: 10.21.0 + node_hash: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b container: use_container: 1 +targets: + android: + var: + node_version: 10.22.1 + node_hash: f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f + input_files: - project: container-image - project: binutils @@ -13,6 +21,6 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b + - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz' + sha256sum: '[% c("var/node_hash") %]' name: node

1 0

[tor-browser-build/maint-10.0-android] Bug 40126: Update toolchains for Fenix 83
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 3845435f4c897fe89c5ae0dca41c1fc0ade62d51 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 20 10:00:35 2020 +0000 Bug 40126: Update toolchains for Fenix 83 Bump clang to final 11.0.0 commit and cbindgen to 0.15.0. Use build-tools and platform-tools 29.0.2 now to align GeckoView and android-components/fenix toolchains better. --- projects/android-toolchain/config | 6 +++--- projects/cbindgen/config | 6 +++--- projects/llvm-project/config | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index b8ef898..5268319 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 29.0.3 +version: 29.0.2 version_old: 28.0.3 var: container: @@ -34,7 +34,7 @@ input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' name: build_tools - sha256sum: 5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855 + sha256sum: 1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08 - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' name: build_tools_old sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a @@ -46,7 +46,7 @@ input_files: # SDK version/build-tools version. - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' name: platform_tools - sha256sum: 49e676ec90bff1f7d7dfe4fb7d0ab78e14fa8fb06a8dccca2ef57a1bc29497a0 + sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 1258b4f..420ce5d 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -14,9 +14,9 @@ var: targets: android: var: - cbindgen_version: 0.14.3 - cbindgen_hash: cc2876f709808a52d132a5f84e53ca1964eb92db - cbindgen_vendor_hash: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b + cbindgen_version: 0.15.0 + cbindgen_hash: 83b3be9f884697a51f8717af8b5498866a81e62e + cbindgen_vendor_hash: e5b843e9f51d93bc7dafdc11492fe4f5645b7a2c2aba02c473c0a81da28b961c input_files: - project: container-image diff --git a/projects/llvm-project/config b/projects/llvm-project/config index 1574177..cf81743 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 11.0.0-rc3 -git_hash: 8aca41f39c207b6f9efe2e448986d109892072ad +version: 11.0.0 +git_hash: 176249bd6732a8044d457092ed932768724a6f06 git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

1 0