- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/wheezy-archive'
by boklm＠torproject.org 04 Apr '19

04 Apr '19

commit d8f156e110afe00e0b366cff8ff0e0c53b4a58c9 Merge: 9dda80f 9907a1f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 11:52:27 2019 +0200 Merge remote-tracking branch 'JeremyRand/wheezy-archive' projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 29966: Use archive.debian.org for Wheezy images
by boklm＠torproject.org 04 Apr '19

04 Apr '19

commit 9907a1f470cf226285f09ba2911a9a45abbee663 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Mar 30 23:33:53 2019 +0000 Bug 29966: Use archive.debian.org for Wheezy images Wheezy is removed from deb.debian.org, so container image builds were failing. --- projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 9499eb8..7d535ec 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% c("version") %].tar.gz' -version: 1 +version: 2 pkg_type: build var: @@ -56,6 +56,7 @@ targets: container: suite: wheezy arch: amd64 + debootstrap_mirror: "http://archive.debian.org/debian/" jessie-amd64: var:

1 0

[tor-browser-build/master] Bug 29980: Add android-x86 target to README files
by boklm＠torproject.org 02 Apr '19

02 Apr '19

commit 9dda80f41584d93b9e30fc534c6de46337fecb30 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 2 07:18:23 2019 +0000 Bug 29980: Add android-x86 target to README files --- README | 1 + README.HACKING | 18 ++++++++++-------- README.MAKEFILE | 12 ++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README b/README index e1e93c6..2b09ab1 100644 --- a/README +++ b/README @@ -81,6 +81,7 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-x86 When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 7634093..081a3d5 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,17 +45,17 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7 + torbrowser-android-armv7, torbrowser-android-x86 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and -torbrowser-android-armv7 are special cases. They do not contain options -directly, instead they contain a list of other targets. For instance, the -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux -targets. You should define an option under the linux target if it applies to -Linux on both architectures, or under the linux-x86_64 if it only applies to the -x86_64 architecture. +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, +torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do +not contain options directly, instead they contain a list of other targets. For +instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and +linux targets. You should define an option under the linux target if it applies +to Linux on both architectures, or under the linux-x86_64 if it only applies to +the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -156,6 +156,8 @@ $platform should be one of the following: - torbrowser-android-armv7 + - torbrowser-android-x86 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: diff --git a/README.MAKEFILE b/README.MAKEFILE index 7351c5f..addff64 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -7,7 +7,8 @@ release Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. -release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as release, for the selected platform only. @@ -16,7 +17,8 @@ alpha Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. -alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -29,7 +31,8 @@ components. The resulting build can be found in directory nightly/$date -nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as nightly, for the selected platform only. @@ -39,7 +42,8 @@ Build Tor Browser for the alpha channel, for all supported platforms. This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date -alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only.

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 6e730d5184f8d74860488f8fa998bd1e0023281f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:56:22 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 29916: Make sure enterprise policies are disabled --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 08d00866ef04..cca469725d28 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -225,6 +225,9 @@ pref("network.file.disable_unc_paths", true); // Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug // 1412081) pref("network.file.path_blacklist", "/net"); +// Make sure no enterprise policy can interfere with our proxy settings, see +// #29916. +pref("browser.policies.testing.disallowEnterprise", true); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 29445: Enable support for enterprise policies"
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit e95c515352094f6c3d943a3313628c370feb18f2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:51:43 2019 +0000 Revert "Bug 29445: Enable support for enterprise policies" This reverts commit 00a7fc743aebc68f59df743236c2165274cbc608. --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 1380c0c228a4..7c864f5fbc43 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { } if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Enterprise policy ${policyName} is not allowed`); + log.error(`Policy ${policyName} is only allowed on ESR`); continue; } @@ -314,6 +314,10 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * + * This is meant to only allow policies to run on ESR, but in practice + * we allow it to run on channels different than release, to allow + * these policies to be tested on pre-release channels. + * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -324,7 +328,12 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; } - return true; + if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || + Cu.isInAutomation) { + return true; + } + + return false; } /*

1 0

[torbutton/master] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 409f01d42ffb9efc85c9245f9baa6ea1831003c2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:06:47 2019 +0000 fixup! Bug 25658: Replace security slider with security level UI Fixes #29973. --- src/chrome/content/torbutton.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bd966485..f1b1dc0c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,7 @@ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.j let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -1898,8 +1898,6 @@ function torbutton_is_windowed(wind) { return true; } -let stopOpenSecuritySettingsObserver; - function showSecurityPreferencesPanel(chromeWindow) { const tabBrowser = chromeWindow.BrowserApp; let settingsTab = null; @@ -1987,7 +1985,6 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); - stopOpenSecuritySettingsObserver(); window.removeEventListener("sizemodechange", m_tb_resize_handler, false);

1 0

[tor-browser-build/master] Bug 29950: Fix error when using a dev version of runc
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 32a4f009d706b9e651071b1b3d361891408eb3aa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 29 13:37:54 2019 +0100 Bug 29950: Fix error when using a dev version of runc --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index f31e5db..e7b5ea4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -477,7 +477,7 @@ ENV: # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m; + return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+(?:-dev)?$/m; }, }, )

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 2825e7f974d50a6394b5a5196c2133c068d85286 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 08:37:20 2019 +0000 fixup! Bug 25658: Replace security slider with security level UI --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 02757a06af72..08d00866ef04 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -271,7 +271,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"torbutton-button\",\"security-level-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[torbutton/master] Bug 29825: Intelligently add the new Security Level button to the taskbar
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit d7595079a561fb36220a83e1d60ba9e6bab289e5 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Mar 29 13:00:00 2019 -0700 Bug 29825: Intelligently add the new Security Level button to the taskbar Added logic to torbutton to add the Security Level button after the url bar, and subsequently move Tor Button between. This new method keeps any UI customizations the user has made. In the event of error, the UI configuration reverts back to the default as specified in the browser.uiCustomization.state pref. --- src/chrome/content/torbutton.js | 47 ++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 15e8d174..bd966485 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -363,34 +363,57 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - //setting up context menu - //var contextMenu = document.getElementById("contentAreaContextMenu"); - //if (contextMenu) - // contextMenu.addEventListener("popupshowing", torbutton_check_contextmenu, false); - - // Add torbutton and security level button to the bar. + // Add torbutton and security level buttons to the bar. // This should maybe be in the startup function, but we want to add // the button to the panel before it's state (color) is set.. - if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button") || - !m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level")) { - torbutton_log(3, 'Adding button'); + let insertedButton = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button"); + let insertedSecurityLevel = m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level"); + if (!insertedButton || !insertedSecurityLevel) { try { // ESR31-style toolbar is handled by the existing compiled-in pref. // We also need to prevent first-run toolbar reorg (#13378), so we // reset this toolbar state on first-run. try { + // get serialized toolbar state + let uiCustomizationStateJSON = m_tb_prefs.getStringPref("browser.uiCustomization.state"); + let uiCustomizationState = JSON.parse(uiCustomizationStateJSON); + + let placeButtonAfterUrlbar = function(navBar, buttonId) { + torbutton_log(3, 'placing ' + buttonId); + // try and remove button if it's present + let buttonIndex = navBar.indexOf(buttonId); + if (buttonIndex != -1) { + navBar.splice(buttonIndex, 1); + } + // if urlbar isn't present (which *shouldn't* be possible), + // inserts button at the beginning of the toolbar (since urlbarIndex will be -1) + let urlbarIndex = navBar.indexOf("urlbar-container"); + buttonIndex = urlbarIndex + 1; + navBar.splice(buttonIndex, 0, buttonId); + }; + + // array of navbar elements + let navBar = uiCustomizationState["placements"]["nav-bar"]; + placeButtonAfterUrlbar(navBar, "security-level-button"); + placeButtonAfterUrlbar(navBar, "torbutton-button"); + + // serialize back into pref + uiCustomizationStateJSON = JSON.stringify(uiCustomizationState, null, 0); + m_tb_prefs.setStringPref("browser.uiCustomization.state", uiCustomizationStateJSON); + } catch(e) { + torbutton_log(4, 'error updating toolbar, reverting to default : ' + e); // reverts the serialized toolbar state to default set in Tor Browser m_tb_prefs.clearUserPref("browser.uiCustomization.state"); - } catch(e) {} + } // reverts toolbar state to firefox defaults CustomizableUI.reset(); // 'restores' toolbar state from serialized state in "browser.uiCustomization.state" CustomizableUI.undoReset(); - torbutton_log(3, 'Button added'); + torbutton_log(3, 'toolbar updated'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_security_level", true); } catch(e) { - torbutton_log(4, 'Failed to add Torbutton to toolbar: '+e); + torbutton_log(4, 'failed to update the toolbar : ' + e); } }

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25623_v4'
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit d869dcdece30316dedbb14045d49ec3f9a71b648 Merge: 893a482 56ba67b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 06:48:43 2019 +0000 Merge remote-tracking branch 'boklm/bug_25623_v4' projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25623: Disable network during build
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 56ba67b3b6345fc70d42567d03b0ff841fe38d3e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 13:20:33 2019 +0100 Bug 25623: Disable network during build --- projects/common/how-to-create-gradle-dependencies-list.txt | 3 ++- projects/common/runc-config.json | 6 ++++++ rbm.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index ef816d0..d980ba2 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -6,7 +6,8 @@ file: export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" -and rerun the build. +then allow network access during the build by setting +var/container/disable_network/build to 0 in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list with the following command (replacing diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index e75c13d..60dfa6c 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -238,6 +238,12 @@ { "type": "uts" }, +[% IF c("var/container/disable_network/" _ c("exec_name")) -%] + { + "type": "network", + "path": "/var/run/netns/rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]" + }, +[% END -%] { "type": "mount" } diff --git a/rbm.conf b/rbm.conf index 32b1f37..f31e5db 100644 --- a/rbm.conf +++ b/rbm.conf @@ -51,6 +51,9 @@ var: container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm + disable_network: + # disable network in the build scripts + build: 1 input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%] [% c("input_files_by_name/" _ file) %] @@ -408,7 +411,13 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns add 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] + [% IF c("var/container/disable_network/" _ c("exec_name")) -%] + sudo ip netns delete 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + [% END -%] remote_put: | #!/bin/sh

1 0

[tor-browser-build/master] Bug 29971: Bump goutls
by gk＠torproject.org 31 Mar '19

31 Mar '19

commit 893a4825b1a430ef955812248ebba8017a5c05d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 31 15:46:58 2019 +0200 Bug 29971: Bump goutls Add bsaes as a new dependency of utls. --- projects/gobsaes/config | 17 +++++++++++++++++ projects/goutls/config | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/projects/gobsaes/config b/projects/gobsaes/config new file mode 100644 index 0000000..4da5828 --- /dev/null +++ b/projects/gobsaes/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +git_url: https://git.schwanenlied.me/yawning/bsaes.git +version: '[% c("abbrev") %]' +git_hash: 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: git.schwanenlied.me/yawning/bsaes.git + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goutls/config b/projects/goutls/config index b21dea9..0a1e416 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 git_url: https://gitlab.com/yawning/utls.git -version: 0.0.9-2 +version: 0.0.10-1 git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: yawning.gpg @@ -15,6 +15,7 @@ var: go_lib_deps: - goxcrypto - gocompress + - gobsaes input_files: - project: container-image @@ -24,3 +25,5 @@ input_files: project: goxcrypto - name: gocompress project: gocompress + - name: gobsaes + project: gobsaes

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] squash! Bug 26961: New user onboarding.
by gk＠torproject.org 29 Mar '19

29 Mar '19

commit d6319109718b5e2bbd82244bce9baeaaea46f356 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 26 11:12:35 2019 -0400 squash! Bug 26961: New user onboarding. Also fix bug 27484: Improve navigation within onboarding. --- .../extensions/onboarding/content/onboarding.css | 25 +++++++++++ .../extensions/onboarding/content/onboarding.js | 51 ++++++++++++++++------ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index fa5f58975c3a..e70cf3fa671a 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -401,6 +401,31 @@ opacity: 0.5; } +/* Tor action buttons appear in the description column rather than the content one. */ +.onboarding-tour-tor-action-button-container { + /* Get higher z-index in order to ensure buttons within container are selectable */ + z-index: 2; + grid-row: tour-button-start / tour-page-end; + grid-column: tour-page-start / tour-content-start; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button { + margin-inline-start: 40px; /* match .onboarding-tour-description */ + float: inline-start; + background: #e6e6e6; + color: #303030; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button:hover:not([disabled]) { + background: #d6d6d6; + cursor: pointer; +} + +.onboarding-tour-tor-action-button-container > .onboarding-tour-action-button:active:not([disabled]) { + background: #c6c6c6; +} + + /* Tour Icons */ #onboarding-tour-singlesearch.onboarding-tour-item::after, #onboarding-notification-bar[data-target-tour-id=onboarding-tour-singlesearch] #onboarding-notification-tour-title::before { diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 8f62e4f3b9d8..ac5569d4b57b 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -119,7 +119,7 @@ var onboardingTourset = { "onboarding.tour-tor-welcome.title", "onboarding.tour-tor-welcome.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-welcome.png"); createOnboardingTourButton(div, - "onboarding-tour-tor-welcome-button", "onboarding.tour-tor-welcome.button"); + "onboarding-tour-tor-welcome-button", "onboarding.tour-tor-welcome.next-button"); return div; }, @@ -165,8 +165,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-circuit-display.title", "onboarding.tour-tor-circuit-display.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-circuit-display.png"); - createOnboardingTourButton(div, + let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-circuit-display-button", "onboarding.tour-tor-circuit-display.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + createOnboardingTourButton(div, + "onboarding-tour-tor-circuit-display-next-button", "onboarding.tour-tor-circuit-display.next-button"); return div; }, @@ -180,8 +183,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); - createOnboardingTourButton(div, + let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + createOnboardingTourButton(div, + "onboarding-tour-tor-security-next-button", "onboarding.tour-tor-security-level.next-button"); return div; }, @@ -195,9 +201,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-expect-differences.title", "onboarding.tour-tor-expect-differences.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-expect-differences.png"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-expect-differences-button", "onboarding.tour-tor-expect-differences.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; createOnboardingTourButton(div, - "onboarding-tour-tor-expect-differences-button", - "onboarding.tour-tor-expect-differences.button"); + "onboarding-tour-tor-expect-differences-next-button", "onboarding.tour-tor-expect-differences.next-button"); return div; }, @@ -211,9 +219,11 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-onion-services.title", "onboarding.tour-tor-onion-services.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-onion-services.png"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-onion-services-button", "onboarding.tour-tor-onion-services.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; createOnboardingTourButton(div, - "onboarding-tour-tor-onion-services-button", - "onboarding.tour-tor-onion-services.button"); + "onboarding-tour-tor-onion-services-next-button", "onboarding.tour-tor-onion-services.next-button"); return div; }, @@ -901,15 +911,13 @@ class Onboarding { this._removeTourFromNotificationQueue(tourId); break; case "onboarding-tour-tor-welcome-button": - this.gotoPage("onboarding-tour-tor-privacy"); - handledTourActionClick = true; - break; case "onboarding-tour-tor-privacy-button": - this.gotoPage("onboarding-tour-tor-network"); - handledTourActionClick = true; - break; case "onboarding-tour-tor-network-button": - this.gotoPage("onboarding-tour-tor-circuit-display"); + case "onboarding-tour-tor-circuit-display-next-button": + case "onboarding-tour-tor-security-next-button": + case "onboarding-tour-tor-expect-differences-next-button": + case "onboarding-tour-tor-onion-services-next-button": + this.gotoNextTourItem(); handledTourActionClick = true; break; case "onboarding-tour-tor-circuit-display-button": @@ -951,6 +959,21 @@ class Onboarding { } } + gotoNextTourItem() { + let activeTourID = this._activeTourId; + if (activeTourID) { + let idx = this._tourItems.findIndex(item => (item.id === activeTourID)); + if (idx >= 0) { + // If at the end of the list, close onboarding; otherwise, go to next. + if (++idx >= this._tourItems.length) { + this.hideOverlay(); + } else { + this.gotoPage(this._tourItems[idx].id); + } + } + } + } + /** * Wrap keyboard focus within the dialog. * When moving forward, focus on the first element when the current focused

1 0

[torbutton/master] Bug 27484: Improve navigation within onboarding
by gk＠torproject.org 27 Mar '19

27 Mar '19

commit 743c1432c0112d74da5c18e9b238ede00ceb550e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 26 11:04:53 2019 -0400 Bug 27484: Improve navigation within onboarding Add strings for new button labels. --- src/chrome/locale/en-US/browserOnboarding.properties | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index 82c9bcca..b97d77a0 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Welcome onboarding.tour-tor-welcome.title=You’re ready. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Privacy onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Circuit Display onboarding.tour-tor-circuit-display.title=See your path. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Be extra protected. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.next-button=Done # Circuit Display onboarding. onboarding.tor-circuit-display.next=Next

1 0

[tor-browser-build/maint-8.0] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit abf8e5043de3b69bf29b641751b5d73852c08b4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c0f5123..6aa3c66 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -29,12 +29,15 @@ targets: - genisoimage - faketime windows: + pre: | + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - - python-future - pre_pkginst: | - # enable jessie-backports for python-future - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list + # python-configparser is required by python-future + - python-configparser windows-i686: var: mar_osname: win32 @@ -95,3 +98,10 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + - name: python-future + URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyt… + sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d + enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit f2e272082fc484f211e0539dc177b1948c4b5d68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 22d99c6..0a82092 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -32,12 +32,15 @@ targets: - genisoimage - faketime windows: + pre: | + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - - python-future - pre_pkginst: | - # enable jessie-backports for python-future - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list + # python-configparser is required by python-future + - python-configparser windows-i686: var: mar_osname: win32 @@ -116,6 +119,13 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + - name: python-future + URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyt… + sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d + enable: '[% c("var/windows") %]' # To generate a new keystore, see how-to-generate-keystore.txt - filename: android-qa.keystore enable: '[% c("var/android") %]'

1 0

[tor-browser-build/maint-8.0] Bump NoScript version to 10.2.5
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit a9c6707fcf44fa22e7e9cd806b3d3b11677e87ae Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:44:50 2019 +0000 Bump NoScript version to 10.2.5 Fixes bug 29872 (XSS popup with DuckDuckGo search on about:tor) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4375835..c0f5123 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 9f55becde2330348c8354bac12ce295dc1e5838f6fc61614a476c7785f5d43f4 + sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump NoScript version to 10.2.5
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit aac31f8aa81a76cd33e0bfd1de2294db4ee79c1c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:44:50 2019 +0000 Bump NoScript version to 10.2.5 Fixes bug 29872 (XSS popup with DuckDuckGo search on about:tor) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1d76492..22d99c6 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -92,9 +92,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 9f55becde2330348c8354bac12ce295dc1e5838f6fc61614a476c7785f5d43f4 + sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[torbutton/master] Fold in stable Changelog
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit 674785b42a87c25d3a08ee0f22aeb17a02cf50e8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:40:48 2019 +0000 Fold in stable Changelog --- src/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index a138a9aa..01150a54 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,9 @@ * Bug 29239: Don't ship the Torbutton .xpi on mobile * Translations update +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.1.4 * Bug 25702: Update Tor Browser icon to follow design guidelines * Bug 21805: Add click-to-play button for WebGL

1 0

[tor-browser-build/master] Folding in stable Changelog (8.0.8)
by gk＠torproject.org 25 Mar '19

25 Mar '19

commit 434e42c5c1a96616f9abe3f390ffa9e839282241 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 25 13:55:02 2019 +0000 Folding in stable Changelog (8.0.8) --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 177307c..46651a3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,12 @@ Tor Browser 8.5a10 -- March 24 2019 * Update NoScript to 10.2.4 * Bug 29733: Work around Mozilla's bug 1532530 +Tor Browser 8.0.8 -- March 22 2019 + * All platforms + * Update Firefox to 60.6.1esr + * Update NoScript to 10.2.4 + * Bug 29733: Work around Mozilla's bug 1532530 + Tor Browser 8.5a9 -- March 20 2019 * All platforms * Update Firefox to 60.6.0esr

1 0

[tor-browser-build/master] Release preparations for 8.5a10
by gk＠torproject.org 22 Mar '19

22 Mar '19

commit 5e2f80c31ce5a7a23ffd276c1980f6b3811c2a21 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 22 10:29:20 2019 +0000 Release preparations for 8.5a10 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index 9c85fcb..679aaee 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.6.0 + firefox_platform_version: 60.6.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2dcb72b..177307c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 8.5a10 -- March 24 2019 + * All platforms + * Update Firefox to 60.6.1esr + * Update NoScript to 10.2.4 + * Bug 29733: Work around Mozilla's bug 1532530 + Tor Browser 8.5a9 -- March 20 2019 * All platforms * Update Firefox to 60.6.0esr diff --git a/rbm.conf b/rbm.conf index 8e3f54b..32b1f37 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a9' - torbrowser_build: 'build3' + torbrowser_version: '8.5a10' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a8 + - 8.5a9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Fold in stable Changelog (8.0.7)
by gk＠torproject.org 22 Mar '19

22 Mar '19

commit 920639b4a5d80a24f6aa7ff2a3082a5a8d7ffa43 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 22 10:25:15 2019 +0000 Fold in stable Changelog (8.0.7) --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 90a1617..2dcb72b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -48,6 +48,18 @@ Tor Browser 8.5a9 -- March 20 2019 * Android * Bug 29632: Use HTTPS for downloading Gradle +Tor Browser 8.0.7 -- March 19 2019 + * All platforms + * Update Firefox to 60.6.0esr + * Update Tor to 0.3.5.8 + * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update Torbutton to 2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + * Windows + * Bug 29081: Harden libwinpthread + * Linux + * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy + Tor Browser 8.5a8 -- February 13 2019 * All platforms * Update Firefox to 60.5.1esr

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.8
by gk＠torproject.org 22 Mar '19

22 Mar '19

commit 46068f47ab0d834f23aea681f3f73320f9c0f6c6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 22 07:02:49 2019 +0000 Release preparations for 8.0.8 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 0d7834c..dcc20c4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.6.0 + firefox_platform_version: 60.6.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4d533ce..0fed743 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 8.0.8 -- March 22 2019 + * All platforms + * Update Firefox to 60.6.1esr + * Update NoScript to 10.2.4 + * Bug 29733: Work around Mozilla's bug 1532530 + Tor Browser 8.0.7 -- March 19 2019 * All platforms * Update Firefox to 60.6.0esr diff --git a/rbm.conf b/rbm.conf index 8d3377b..f63c3a1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.7' - torbrowser_build: 'build3' + torbrowser_version: '8.0.8' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.0.6 + - 8.0.7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 29848: Fix "optionaly" typo
by gk＠torproject.org 21 Mar '19

21 Mar '19

commit afb8211e83a2a7adb29c0164836067327fcecd7d Author: JeremyRand <biolizard89(a)gmail.com> Date: Thu Mar 21 15:43:29 2019 +0000 Bug 29848: Fix "optionaly" typo --- projects/go/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/go/config b/projects/go/config index ab0a6d3..c039b04 100644 --- a/projects/go/config +++ b/projects/go/config @@ -21,7 +21,7 @@ var: # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. - # You need to define /var/go_lib, and optionaly var/go_lib_install as + # You need to define /var/go_lib, and optionally var/go_lib_install as # a list of install targets. build_go_lib: | #!/bin/bash

1 0

[tor-browser-build/maint-8.0] Bump NoScript to 10.2.4
by gk＠torproject.org 21 Mar '19

21 Mar '19

commit 378de243109024a80e841bfa47efcca5d7a5c18f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 21 07:55:20 2019 +0000 Bump NoScript to 10.2.4 We work around Mozilla's bug 1532530 (tracked in #29733). --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3823552..4375835 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 + sha256sum: 9f55becde2330348c8354bac12ce295dc1e5838f6fc61614a476c7785f5d43f4 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0