September 2018 - tbb-commits - lists.torproject.org

[torbutton/master] Bug 27663: Add New Identity menuitem again
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 2ba36eb269b86ca90835c3e39f6b4a7546dd76ba Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 14:56:36 2018 +0000 Bug 27663: Add New Identity menuitem again Moving the New Identity button to the hamburger menu without having the redesign of our security controls in place and without having a proper guidance for where we moved it to is confusing. Let's revert that decision until we have all required pieces ready. We omit the key attribute from the menu item to avoid doing a New Identity twice if users press Ctrl+Shift+u. --- src/chrome/content/popup.xul | 6 ++++++ src/chrome/content/torbutton.js | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index b4191e30..582593f6 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -15,6 +15,12 @@ anchor="torbutton-button" position="after_start" > <hbox align="start"> <vbox> + <menuitem id="torbutton-new-identity" + label="&torbutton.context_menu.new_identity;" + accesskey="&torbutton.context_menu.new_identity_key;" + insertafter="context-stop" + oncommand="torbutton_new_identity()"/> + <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c3f68510..9f6ba898 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -822,6 +822,9 @@ function torbutton_new_identity() { try { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). + // TODO: Remove the Torbutton menu entry again once we have done our + // security control redesign. + document.getElementById("torbutton-new-identity").disabled = true; document.getElementById("menu_newIdentity").disabled = true; document.getElementById("appMenuNewIdentity").disabled = true; @@ -846,6 +849,9 @@ function torbutton_new_identity() { if (confirmed) { torbutton_do_new_identity(); } else { + // TODO: Remove the Torbutton menu entry again once we have done our + // security control redesign. + document.getElementById("torbutton-new-identity").disabled = false; document.getElementById("menu_newIdentity").disabled = false; document.getElementById("appMenuNewIdentity").disabled = false; } @@ -855,6 +861,9 @@ function torbutton_new_identity() { } catch(e) { // If something went wrong make sure we have the New Identity button // enabled (again). + // TODO: Remove the Torbutton menu entry again once we have done our + // security control redesign. + document.getElementById("torbutton-new-identity").disabled = false; document.getElementById("menu_newIdentity").disabled = false; document.getElementById("appMenuNewIdentity").disabled = false; torbutton_log(5, "Unexpected error on new identity: "+e); @@ -1628,6 +1637,9 @@ function torbutton_check_protections() document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { + // TODO: Remove the Torbutton menu entry again once we have done our + // security control redesign. + document.getElementById("torbutton-new-identity").disabled = true; document.getElementById("menu_newIdentity").disabled = true; document.getElementById("appMenuNewIdentity").disabled = true; }

1 0

[tor-browser-build/maint-8.0] Use first stable tor in the 0.3.4 series
by gk＠torproject.org 11 Sep '18

11 Sep '18

commit 6d09f7a6b7cffc04551f8909fde975f9e21f2d96 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 11 09:40:16 2018 +0000 Use first stable tor in the 0.3.4 series This fixes a crash bug on macOS 10.9.x as well (see: bug 27482). --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index aeea5e0..1549369 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.3.9 +version: 0.3.4.8 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser-build/maint-8.0] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit f71743e229b4a696fabccb4632df919bed2b1ee3 Merge: 80410af 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:33:44 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0 projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26570'
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 01d1537144fc2ecd5a9c1f346b0d889234666051 Merge: 6c19357 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:31:20 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/master] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 6c1935752caf9c72595d9e20cbf0da2300783ab6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit e16754013b11c941efe92f19ff2b041fffca8906 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 80410afe4226a0a20feb5f9470e33ae31f1e9f8d Merge: eea6a6a e167540 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:17:42 2018 +0000 Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0 projects/release/update_responses_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/maint-8.0] Bug 27179: update mar_compression
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 8955afc1fb84a191268219b7f4c28050585b791a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 17 11:21:22 2018 +0200 Bug 27179: update mar_compression Set mar_compression to xz for the alpha, and bzip2 for the stable. --- projects/release/update_responses_config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..d1ed52f 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,10 +47,11 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF ! c("var/release") -%] - mar_compression: xz -[% END -%] +[% IF c("var/release") -%] mar_compression: bzip2 +[% ELSE -%] +mar_compression: xz +[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0