- tbb-commits - lists.torproject.org

[torbutton/master] Bug 27478: Torbutton icons for dark theme
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 9156c5564a5da6bd8e17eab094d655034e4135b6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 02:18:41 2018 -0700 Bug 27478: Torbutton icons for dark theme --- src/chrome/skin/torbutton-dark-update-needed.svg | 13 +++++++++++++ src/chrome/skin/torbutton-dark.svg | 9 +++++++++ src/chrome/skin/torbutton.css | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg b/src/chrome/skin/torbutton-dark-update-needed.svg new file mode 100644 index 00000000..44df4a00 --- /dev/null +++ b/src/chrome/skin/torbutton-dark-update-needed.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-Update---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" fill="#F9F9FA" fill-opacity="0.8"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 Z" id="Half-Content"></path> + </g> + <g id="!" transform="translate(0.000000, 6.100000)"> + <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> + <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton-dark.svg b/src/chrome/skin/torbutton-dark.svg new file mode 100644 index 00000000..55d633e8 --- /dev/null +++ b/src/chrome/skin/torbutton-dark.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> + <g id="Tor-Button-Icon" fill="#F9F9FA"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index cf90ae6d..928ba93d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -6,10 +6,21 @@ list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } } +@keyframes blink-update-dark { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); + } +} #torbutton-button { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } +toolbar[brighttext] #torbutton-button { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); +} #torbutton-button[tbstatus="on"] { opacity: 1.0; } @@ -20,6 +31,10 @@ opacity: 1.0; animation: blink-update normal 1s infinite ease-in-out; } +toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] { + opacity: 1.0; + animation: blink-update-dark normal 1s infinite ease-in-out; +} #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/torbutton.svg");

1 0

[torbutton/master] Bug 27506: Move status version to UL corner for RTL locales
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 2754f4d06268c18e9121de41e436335a6946efc5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 00:24:00 2018 -0700 Bug 27506: Move status version to UL corner for RTL locales We use both offset-inline-end and inset-inline-end because the former is supported in Firefox 60 and the latter is supported in Firefox 63 and later. --- src/chrome/skin/aboutTor.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index c402bbed..2e6bab75 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -58,12 +58,13 @@ body:not([initialized]) { #torstatus-version { position: absolute; top: 6px; - right: 6px; + offset-inline-end: 6px; + inset-inline-end: 6px; height: 30px; width: 200px; font-size: 15px; white-space: pre-wrap; - text-align: right; + text-align: end; } a {

1 0

[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 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