- tbb-commits - lists.torproject.org

[torbutton/master] bug 25013: Add Gecko build system infrastructure into tor button
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 5f10327ae16666ff4beb64a206a64a7760898b01 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:04 2018 -0200 bug 25013: Add Gecko build system infrastructure into tor button --- moz.build | 12 +++++++++++ src/jar.mn | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/moz.build b/moz.build new file mode 100644 index 00000000..5e067c98 --- /dev/null +++ b/moz.build @@ -0,0 +1,12 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +JAR_MANIFESTS += ['src/jar.mn'] +JS_PREFERENCE_FILES += [ + 'src/defaults/preferences/preferences.js', +] +FINAL_TARGET_FILES.features['torbutton(a)torproject.org'] += [ + 'src/install.rdf' +] diff --git a/src/jar.mn b/src/jar.mn new file mode 100644 index 00000000..142a5773 --- /dev/null +++ b/src/jar.mn @@ -0,0 +1,68 @@ +#filter substitution + +torbutton.jar: + +% content torbutton %content/ + + content/ (chrome/content/*) + components/ (components/*) + defaults/ (defaults/*) + modules/ (modules/*) + skin/ (chrome/skin/*) + +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/torbutton.xul +% overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/content/pref-connection.xul +% overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul +% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul +% overlay about:addons chrome://torbutton/content/torbutton-extensions.xul +% overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul +% resource torbutton % +% resource torbutton-assets resource://torbutton/skin/ contentaccessible=yes + +# browser branding +% override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd +% override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +% overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul + +# UI customization +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul +% overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul + +# Strings for the about:tbupdate page +% override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd + +% locale torbutton @AB_CD@ %locale/@AB_CD@/ + locale/@AB_CD@/ (chrome/locale/@AB_CD@/*) + +% skin torbutton classic/1.0 %skin/ +% style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css + +# Firefox 4-style component registration +% component {f605ec27-d867-44b5-ad97-2a29276642c3} %components/dragDropFilter.js +% contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + +% component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} %components/external-app-blocker.js +% contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} + +% component {06322def-6fde-4c06-aef6-47ae8e799629} %components/startup-observer.js +% contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} + +% component {e6204253-b690-4159-bfe8-d4eedab6b3be} %components/cookie-jar-selector.js +% contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be} + +% component {5d57312b-5d8c-4169-b4af-e80d6a28a72e} %components/torCheckService.js +% contract @torproject.org/torbutton-torCheckService;1 {5d57312b-5d8c-4169-b4af-e80d6a28a72e} + +% component {f36d72c9-9718-4134-b550-e109638331d7} %components/torbutton-logger.js +% contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d7} + +% component {e33fd6d4-270f-475f-a96f-ff3140279f68} %components/domain-isolator.js +% contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68} + +% category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 + +% category profile-after-change StartupObserver @torproject.org/startup-observer;1 +% category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 +% category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1

1 0

[torbutton/master] bug 25013: Remove non needed import, it is already available in the window object
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 9c2adcecd64ab6a390e305509fbe77d1acb9ea90 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:35 2018 -0200 bug 25013: Remove non needed import, it is already available in the window object --- src/chrome/content/torbutton.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fc1a38d8..90da5827 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,8 +13,6 @@ 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", {}); -Cu.importGlobalProperties(["XMLHttpRequest"]); - 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";

1 0

[torbutton/master] bug 25013: Create symlink to en locale folder following mozilla standard naming
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 78d26b12542bc8b05c3624f0ce17096d0e6cb5db Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 12 02:12:53 2018 -0200 bug 25013: Create symlink to en locale folder following mozilla standard naming Additionally, remove it when using the makexpi to create a xpi package. XPI packages are using the chrome.manifest and they support multi lang bundle. --- makexpi.sh | 4 ++-- src/chrome/locale/en-US | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index 243fbd6b..aa3e665b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US new file mode 120000 index 00000000..2c4c454f --- /dev/null +++ b/src/chrome/locale/en-US @@ -0,0 +1 @@ +en \ No newline at end of file

1 0

[torbutton/master] Merge remote-tracking branch 'igt0/25013-v4'
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 831c8bee11a464b42dcee9c84ad52fca07e5e241 Merge: 923fd850 78d26b12 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 11:21:30 2018 +0000 Merge remote-tracking branch 'igt0/25013-v4' makexpi.sh | 4 +-- moz.build | 12 ++++++++ src/chrome/content/torbutton.js | 2 -- src/chrome/locale/en-US | 1 + src/jar.mn | 68 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 28260: Use Rust 1.28.0 to build Tor
by gk＠torproject.org 11 Nov '18

11 Nov '18

commit 0a633e6289822f316b838b32fe0135d5b7c9967d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 31 11:04:03 2018 +0100 Bug 28260: Use Rust 1.28.0 to build Tor As rbm currently does not do deep merge of options hashes (bug 26185) we cannot modify var/* options from the input_files section (or we lose all the other var/* options). As a workaround we move the two options we need to modify under input_file_var/ instead of var/. --- projects/rust/build | 4 ++-- projects/rust/config | 11 +++++++++-- projects/tor/config | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 5f421c7..7ae3073 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -2,7 +2,7 @@ [% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist +mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] @@ -32,7 +32,7 @@ export PATH="$distdir-rust-old/bin:$PATH" done cd .. ln -s x86_64-apple-darwin11 x86_64-apple-darwin - mkdir -p $distdir/helper + mkdir $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort diff --git a/projects/rust/config b/projects/rust/config index d3f9c40..83ae690 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,8 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.26.1 -var: +version: '[% c("input_file_var/rust_version") %]' + +# those values can be changed from the input_files section of other +# projects. See projects/tor/config and bug 28260. +input_file_var: + rust_version: 1.26.1 prev_version: 1.25.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' rust_arch: '[% c("arch") %]' container: use_container: 1 diff --git a/projects/tor/config b/projects/tor/config index bb743ca..cc6df23 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -60,4 +60,9 @@ input_files: project: '[% c("var/compiler") %]' - name: rust project: rust + # Tor needs rust >= 1.28.0 + # See bug 28260 + input_file_var: + rust_version: 1.28.0 + prev_version: 1.27.2 enable: '[% c("var/linux") && c("var/nightly") %]'

1 0

[torbutton/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 923fd8500a16b0a343450621a62ea10175c38b3d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:37:19 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Tor Launcher has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/components/torbutton-logger.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index b25d039b..fdf7bb7d 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -154,6 +154,16 @@ TorbuttonLogger.prototype = switch (data) { case "extensions.torbutton.logmethod": this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); + if (this.logmethod === 0) { + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + true); + } else if (Services.prefs. + getIntPref("extensions.torlauncher.logmethod", 3) !== 0) { + // If Tor Launcher is not available or its log method is not 0 + // then let's reset the dump pref. + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + false); + } break; case "extensions.torbutton.loglevel": this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel");

1 0

[tor-launcher/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 80749f18beb93f94cb6be9a5e2c17438ff133ab8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:40:28 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Torbutton has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/modules/tl-logger.jsm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index a2ea404..551ad92 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -151,6 +151,14 @@ let TLLoggerInternal = // Private case "extensions.torlauncher.logmethod": this.mLogMethod = TorLauncherUtil.getIntPref( "extensions.torlauncher.logmethod"); + if (this.mLogMethod === 0) { + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", true); + } else if (TorLauncherUtil. + getIntPref("extensions.torbutton.logmethod", 3) !== 0) { + // If Torbutton is not available or its log method is not 0 + // then let's reset the dump pref. + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", false); + } break; case "extensions.torlauncher.loglevel": this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-browser-build/maint-8.0] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 7daa78893b9b6a2034617233a0bb85c272d07fa1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[tor-browser-build/master] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit ee32f3ea93954ab5d13cdcf333a1f85aa3dca02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[torbutton/master] Bug 28187: Change tor circuit icon to torbutton.svg
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 6a9a4f528d8b8254402802a7a86cd722b747a5a6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 2 10:03:35 2018 -0700 Bug 28187: Change tor circuit icon to torbutton.svg Also, introduce a "new circuit" icon (designed by Antonela Debiasi) to hamburger menu. --- src/chrome/content/menu-items-overlay.xul | 2 ++ src/chrome/skin/new_circuit.svg | 8 ++++++++ src/chrome/skin/relay.svg | 10 ---------- src/chrome/skin/tor-circuit-display.css | 6 +++--- src/chrome/skin/torbutton.css | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul index 274c9c71..b2e862b3 100644 --- a/src/chrome/content/menu-items-overlay.xul +++ b/src/chrome/content/menu-items-overlay.xul @@ -15,10 +15,12 @@ label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> <toolbarbutton id="appMenuNewIdentity" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-identity-key" label="&torbutton.context_menu.new_identity;" oncommand="torbutton_new_identity();"/> <toolbarbutton id="appMenuNewCircuit" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-circuit-key" label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> diff --git a/src/chrome/skin/new_circuit.svg b/src/chrome/skin/new_circuit.svg new file mode 100644 index 00000000..e0a93cc8 --- /dev/null +++ b/src/chrome/skin/new_circuit.svg @@ -0,0 +1,8 @@ +<?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"> + <title>Icon / New Circuit(a)1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg deleted file mode 100644 index b2f5f16c..00000000 --- a/src/chrome/skin/relay.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>relay</title> - <desc>Created with Sketch.</desc> - <defs></defs> - <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> - <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> - </g> -</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index ed17f91d..576590a4 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -8,12 +8,12 @@ and lines drawn between them to represent Tor network inter-relay connections. #circuit-display-content { - background-image: url(chrome://torbutton/skin/relay.svg); + background-image: url(chrome://torbutton/skin/torbutton.svg); background-position: 1em 1em; background-repeat: no-repeat; background-size: 24px auto; - background-color: rgba(255,255,255,0.4); - background-blend-mode: lighten; + background-color: rgba(255,255,255,0.15); + background-blend-mode: overlay; cursor: default; padding: 0.5em 0px 0.5em; padding-inline-end: 1em; diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 928ba93d..28333874 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -80,5 +80,5 @@ svg#tor-circuit circle.node-circle { } #appMenuNewCircuit { - list-style-image: url("chrome://torbutton/skin/relay.svg"); + list-style-image: url("chrome://torbutton/skin/new_circuit.svg"); }

1 0