August 2014 - tor-commits - lists.torproject.org

[torbutton/master] Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b0d3f1879bf6b3bb61499c8178155729457856a5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:18:10 2014 +0000 Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file. Also, clarify UI strings which explain HTML5 canvas fingerprinting and options within the PopupNotification dialogue, and make capitalisation consistent. * FIXES #12684. [0] [0]: https://bugs.torproject.org/12684 --- src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d34432d..c04b1e8 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.notNow=Not Now +canvas.notNowAccessKey=N +canvas.allow=Allow in the future canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Never for this site (recommended) canvas.neverAccessKey=e

1 0

[onionoo/master] Add Vagrantfile and provisioning shell script.
by karsten＠torproject.org 19 Aug '14

19 Aug '14

commit 20623020e4bf25f97a0277d8aeed3347c9c3dd34 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 19 20:18:57 2014 +0200 Add Vagrantfile and provisioning shell script. --- HOWTO-VAGRANT.md | 42 ++++++++++++++++++++++++++++++++++++++++++ Vagrantfile | 19 +++++++++++++++++++ vagrant/bootstrap.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/HOWTO-VAGRANT.md b/HOWTO-VAGRANT.md new file mode 100644 index 0000000..ae8783e --- /dev/null +++ b/HOWTO-VAGRANT.md @@ -0,0 +1,42 @@ +How to use Vagrant to build and test Onionoo +============================================ + +Before using Vagrant, make sure that Onionoo builds correctly on the host system. This may require running `git submodule init && git submodule update`, as well as providing all required libraries. + +Create a Debian Wheezy 64 bit instance: + +``` +vagrant up +``` + +This command downloads the virtual machine imagine, unless it has been downloaded before, creates a new virtual machine, and runs the bootstrap script in `vagrant/bootstrap.sh`. This may take a few minutes. + +Once this is all done, log into the virtual machine and change to the Onionoo working directory: + +``` +vagrant ssh +cd /srv/onionoo.torproject.org/onionoo/ +``` + +Important: better avoid runninng Ant in the `/vagrant/` directory (which is shared with the host), or the guest system will write directly to the host system, which performs not really well. + +Compile Onionoo, run the unit tests and then the cron part of it: + +``` +ant compile +ant test +ant run +``` + +This step may take an hour or more. Onionoo downloads the last three days of Tor descriptors, which is about 2 GiB, and processes them. + +Once these steps are done, deploy the servlet to the local Tomcat server: + +``` +ant war +``` + +Test the Onionoo service using a browser on the host (port 8080 on the guest is forwarded to the host). Sample URL: + +http://localhost:8080/onionoo/summary?limit=2 + diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..c30e452 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,19 @@ +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + + config.vm.box = "wheezy64" + config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.…" + + config.vm.boot_timeout = 60 + + config.vm.network "forwarded_port", guest: 8080, host: 8080 + + config.vm.provider "virtualbox" do |vb| + vb.memory = 4096 + end + + config.vm.provision :shell, :path => "vagrant/bootstrap.sh" + +end + diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh new file mode 100644 index 0000000..78e48f3 --- /dev/null +++ b/vagrant/bootstrap.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +echo "Starting provisioning." + +echo "Updating package list and upgrading existing packages." +apt-get update +apt-get -y upgrade + +echo "Installing required packages." +apt-get install -y libcommons-codec-java libcommons-compress-java \ +libcommons-lang-java libgoogle-gson-java junit4 libservlet3.0-java \ +openjdk-6-jdk ant liblog4j1.2-java tomcat6 + +echo "Setting up paths and creating symbolic links." +mkdir -p /srv/onionoo.torproject.org/onionoo/ +cd /srv/onionoo.torproject.org/onionoo/ +ln -s /vagrant/bin +ln -s /vagrant/build.xml +ln -s /vagrant/deps +ln -s /vagrant/etc +ln -s /vagrant/geoip +ln -s /vagrant/src +ln -s /vagrant/web +ln -s /srv/o +ln -s /srv/onionoo.torproject.org/onionoo/onionoo.war \ +/var/lib/tomcat6/webapps/onionoo.war +chown -R vagrant:vagrant /srv/onionoo.torproject.org/ + +echo "Done provisioning." +

1 0

[onionoo/master] Fix stupid boolean logic fail.
by karsten＠torproject.org 19 Aug '14

19 Aug '14

commit 8c0b411537449b25ebb35cbac8e3cc4e3813f182 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 19 20:06:46 2014 +0200 Fix stupid boolean logic fail. 29109e2 introduced a bug that led to skipping server descriptors if they were newer than all server descriptors we parsed before; which is the opposite of what we're supposed to do. Reported on tor-relays@. --- .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 8d5ab0b..6341afd 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -107,7 +107,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, DetailsStatus.class, true, fingerprint); if (detailsStatus == null) { detailsStatus = new DetailsStatus(); - } else if (descriptor.getPublishedMillis() > + } else if (descriptor.getPublishedMillis() <= detailsStatus.getDescPublished()) { return; } @@ -225,7 +225,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, DetailsStatus.class, true, fingerprint); if (detailsStatus == null) { detailsStatus = new DetailsStatus(); - } else if (detailsStatus.getDescPublished() > + } else if (detailsStatus.getDescPublished() <= descriptor.getPublishedMillis()) { return; }

1 0

[tor/release-0.2.5] Sort the 0257 changelog entries by section; combine two.
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit f8ca81c04fdc80b8d66692926f0da6abd0996790 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 19 12:29:13 2014 -0400 Sort the 0257 changelog entries by section; combine two. --- ChangeLog | 52 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed30088..2800351 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,37 @@ Changes in version 0.2.5.7-beta - 2014-08-?? - o Major bugfixes: + o Major bugfixes (client, startup): - When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would mistakenly cache this conclusion and continue believing it even when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. - o Build fixes: + o Major bugfixes (relay): + - Avoid queuing or sending destroy cells for circuit ID zero when we + fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1. + Found and fixed by "cypherpunks". + + o Minor features (bridge): + - Add an ExtORPortCookieAuthFileGroupReadable option to make the + cookie file for the ExtORPort g+r by default. + + o Minor features (geoip): + - Update geoip and geoip6 to the August 7 2014 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (controller): + - Restore the functionality of CookieAuthFileGroupReadable. Fixes + bug 12864; bugfix on 0.2.5.1-alpha. + + o Minor bugfixes (compilation): - Allow our autoconf to run correctly with autoconf 2.62 again. Fixes bug 12693; bugfix on 0.2.5.2-alpha. + - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; + bugfix on 0.2.5.5-alpha. - o Distribution: + o Distribution (systemd): - Verify configuration file via ExecStartPre in the systemd unit file. Patch from intrigeri; resolves ticket 12730. - - o Distribution: - Explicitly disable RunAsDaemon in the systemd unit file. Our current systemd unit uses "Type = simple", so systemd does not expect tor to fork. If the user has "RunAsDaemon 1" in their @@ -29,31 +46,6 @@ Changes in version 0.2.5.7-beta - 2014-08-?? several documents on the website. Patch from Matt Pagan. Fixes bug 12830. - o Major bugfixes (relay): - - Avoid queuing or sending destroy cells for circuit ID zero when we - fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1. - Found and fixed by "cypherpunks". - - o Minor bugfixes: - - Restore the functionality of CookieAuthFileGroupReadable. Fixes - bug 12864; bugfix on 0.2.5.1-alpha. - - o Minor features: - - Add an ExtORPortCookieAuthFileGroupReadable option to make the - cookie file for the ExtORPort g+r by default. - - o Minor features: - - Update geoip6 to the August 7 2014 Maxmind GeoLite2 - Country database. - - o Minor features: - - Update geoip to the August 7 2014 Maxmind GeoLite2 - Country database. - - o Minor bugfixes (compilation): - - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; - bugfix on 0.2.5.5-alpha. - Changes in version 0.2.5.6-alpha - 2014-07-28 Tor 0.2.5.6-alpha brings us a big step closer to slowing down the

1 0

[tor/release-0.2.5] Continue 0.2.5.7 changelog: reflow and sort with format_changelog
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit ad8281cb8bc882aa8ac56fa3959af8d68238df38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 19 12:26:04 2014 -0400 Continue 0.2.5.7 changelog: reflow and sort with format_changelog --- ChangeLog | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97ff825..ed30088 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,20 +7,22 @@ Changes in version 0.2.5.7-beta - 2014-08-?? fix for bug 11200; bugfix on 0.2.5.4-alpha. o Build fixes: - - Allow our autoconf to run correctly with autoconf 2.62 - again. Fixes bug 12693; bugfix on 0.2.5.2-alpha. o Distribution: - - Verify configuration file via ExecStartPre in the systemd unit file. - Patch from intrigeri; resolves ticket 12730. + - Allow our autoconf to run correctly with autoconf 2.62 again. + Fixes bug 12693; bugfix on 0.2.5.2-alpha. o Distribution: - - Explicitly disable RunAsDaemon in the systemd unit file. - Our current systemd unit uses "Type = simple", so systemd does - not expect tor to fork. If the user has "RunAsDaemon 1" in their + - Verify configuration file via ExecStartPre in the systemd unit + file. Patch from intrigeri; resolves ticket 12730. + + o Distribution: + - Explicitly disable RunAsDaemon in the systemd unit file. Our + current systemd unit uses "Type = simple", so systemd does not + expect tor to fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as expected. This is e.g. the case - on Debian (and derivatives), since there we pass - "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" - (that contains "RunAsDaemon 1") by default. - Patch by intrigeri; resolves ticket 12731. + on Debian (and derivatives), since there we pass "--defaults-torrc + /usr/share/tor/tor-service-defaults-torrc" (that contains + "RunAsDaemon 1") by default. Patch by intrigeri; resolves + ticket 12731. o Documentation: - Adjust the URLs in the README to refer to the new locations of @@ -28,23 +30,25 @@ Changes in version 0.2.5.7-beta - 2014-08-?? bug 12830. o Major bugfixes (relay): - - Avoid queuing or sending destroy cells for circuit ID zero when - we fail to send a CREATE cell. Fixes bug 12848; bugfix on - 0.0.8pre1. Found and fixed by "cypherpunks". + - Avoid queuing or sending destroy cells for circuit ID zero when we + fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1. + Found and fixed by "cypherpunks". o Minor bugfixes: - - Restore the functionality of CookieAuthFileGroupReadable. Fixes bug - 12864; bugfix on 0.2.5.1-alpha. + - Restore the functionality of CookieAuthFileGroupReadable. Fixes + bug 12864; bugfix on 0.2.5.1-alpha. o Minor features: - Add an ExtORPortCookieAuthFileGroupReadable option to make the cookie file for the ExtORPort g+r by default. o Minor features: - - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. + - Update geoip6 to the August 7 2014 Maxmind GeoLite2 + Country database. o Minor features: - - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database. + - Update geoip to the August 7 2014 Maxmind GeoLite2 + Country database. o Minor bugfixes (compilation): - Fix compilation of test.h with MSVC. Patch from Gisle Vanem;

1 0

[tor/release-0.2.5] Start on the 0.2.5 changelog: add changes/* unchanged.
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit 9fc5dd8ae75c03782c1ee5ba10158c52c4f5cab4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 19 12:24:58 2014 -0400 Start on the 0.2.5 changelog: add changes/* unchanged. --- ChangeLog | 53 +++++++++++++++++++++++++++++ changes/bug11200-caching | 7 ---- changes/bug12730-systemd-verify-config | 3 -- changes/bug12731-systemd-no-run-as-daemon | 9 ----- changes/bug12830 | 4 --- changes/bug12848 | 4 --- changes/bug12864 | 7 ---- changes/geoip-august2014 | 3 -- changes/geoip6-august2014 | 3 -- changes/test.h_msvc | 3 -- 10 files changed, 53 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b33e5e..97ff825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +Changes in version 0.2.5.7-beta - 2014-08-?? + o Major bugfixes: + - When Tor starts with DisabledNetwork set, it would correctly + conclude that it shouldn't try making circuits, but it would + mistakenly cache this conclusion and continue believing it even + when DisableNetwork is set to 0. Fixes the bug introduced by the + fix for bug 11200; bugfix on 0.2.5.4-alpha. + + o Build fixes: + - Allow our autoconf to run correctly with autoconf 2.62 + again. Fixes bug 12693; bugfix on 0.2.5.2-alpha. o Distribution: + - Verify configuration file via ExecStartPre in the systemd unit file. + Patch from intrigeri; resolves ticket 12730. + + o Distribution: + - Explicitly disable RunAsDaemon in the systemd unit file. + Our current systemd unit uses "Type = simple", so systemd does + not expect tor to fork. If the user has "RunAsDaemon 1" in their + torrc, then things won't work as expected. This is e.g. the case + on Debian (and derivatives), since there we pass + "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" + (that contains "RunAsDaemon 1") by default. + Patch by intrigeri; resolves ticket 12731. + + o Documentation: + - Adjust the URLs in the README to refer to the new locations of + several documents on the website. Patch from Matt Pagan. Fixes + bug 12830. + + o Major bugfixes (relay): + - Avoid queuing or sending destroy cells for circuit ID zero when + we fail to send a CREATE cell. Fixes bug 12848; bugfix on + 0.0.8pre1. Found and fixed by "cypherpunks". + + o Minor bugfixes: + - Restore the functionality of CookieAuthFileGroupReadable. Fixes bug + 12864; bugfix on 0.2.5.1-alpha. + + o Minor features: + - Add an ExtORPortCookieAuthFileGroupReadable option to make the + cookie file for the ExtORPort g+r by default. + + o Minor features: + - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. + + o Minor features: + - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database. + + o Minor bugfixes (compilation): + - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; + bugfix on 0.2.5.5-alpha. + + Changes in version 0.2.5.6-alpha - 2014-07-28 Tor 0.2.5.6-alpha brings us a big step closer to slowing down the risk from guard rotation, and fixes a variety of other issues to get diff --git a/changes/bug11200-caching b/changes/bug11200-caching deleted file mode 100644 index e3fbaec..0000000 --- a/changes/bug11200-caching +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes: - - When Tor starts with DisabledNetwork set, it would correctly - conclude that it shouldn't try making circuits, but it would - mistakenly cache this conclusion and continue believing it even - when DisableNetwork is set to 0. Fixes the bug introduced by the - fix for bug 11200; bugfix on 0.2.5.4-alpha. - diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config deleted file mode 100644 index 221633c..0000000 --- a/changes/bug12730-systemd-verify-config +++ /dev/null @@ -1,3 +0,0 @@ - o Distribution: - - Verify configuration file via ExecStartPre in the systemd unit file. - Patch from intrigeri; resolves ticket 12730. diff --git a/changes/bug12731-systemd-no-run-as-daemon b/changes/bug12731-systemd-no-run-as-daemon deleted file mode 100644 index f92e5af..0000000 --- a/changes/bug12731-systemd-no-run-as-daemon +++ /dev/null @@ -1,9 +0,0 @@ - o Distribution: - - Explicitly disable RunAsDaemon in the systemd unit file. - Our current systemd unit uses "Type = simple", so systemd does - not expect tor to fork. If the user has "RunAsDaemon 1" in their - torrc, then things won't work as expected. This is e.g. the case - on Debian (and derivatives), since there we pass - "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" - (that contains "RunAsDaemon 1") by default. - Patch by intrigeri; resolves ticket 12731. diff --git a/changes/bug12830 b/changes/bug12830 deleted file mode 100644 index 835ebe2..0000000 --- a/changes/bug12830 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation: - - Adjust the URLs in the README to refer to the new locations of - several documents on the website. Patch from Matt Pagan. Fixes - bug 12830. diff --git a/changes/bug12848 b/changes/bug12848 deleted file mode 100644 index 7aa79c3..0000000 --- a/changes/bug12848 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (relay): - - Avoid queuing or sending destroy cells for circuit ID zero when - we fail to send a CREATE cell. Fixes bug 12848; bugfix on - 0.0.8pre1. Found and fixed by "cypherpunks". diff --git a/changes/bug12864 b/changes/bug12864 deleted file mode 100644 index 79e751f..0000000 --- a/changes/bug12864 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - Restore the functionality of CookieAuthFileGroupReadable. Fixes bug - 12864; bugfix on 0.2.5.1-alpha. - - o Minor features: - - Add an ExtORPortCookieAuthFileGroupReadable option to make the - cookie file for the ExtORPort g+r by default. diff --git a/changes/geoip-august2014 b/changes/geoip-august2014 deleted file mode 100644 index 90d8ecb..0000000 --- a/changes/geoip-august2014 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-august2014 b/changes/geoip6-august2014 deleted file mode 100644 index 7e7c9a9..0000000 --- a/changes/geoip6-august2014 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. - diff --git a/changes/test.h_msvc b/changes/test.h_msvc deleted file mode 100644 index 3afbc13..0000000 --- a/changes/test.h_msvc +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; - bugfix on 0.2.5.5-alpha.

1 0

[tor-launcher/master] Do not show copy log button when help is open.
by brade＠torproject.org 19 Aug '14

19 Aug '14

commit fb7e0576942310ff262165ecf6cf7c2bf2ed48bd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 19 11:10:07 2014 -0400 Do not show copy log button when help is open. If a Tor error or warning message arrived while the Bridge Help was open, the "Copy Tor Log To Clipboard" button was shown immediately (instead of after the help was closed). --- src/chrome/content/network-settings.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e84f92..5f3f698 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -439,10 +439,7 @@ function showPanel(aPanelID) var deckElem = document.getElementById("deck"); if (deckElem) - { deckElem.selectedPanel = document.getElementById(aPanelID); - showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); - } else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); @@ -527,17 +524,19 @@ function showErrorMessage(aTorExited, aErrorMsg) function showCopyLogButton(aHaveErrorOrWarning) { - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { - if (getWizard()) + let haveWizard = (getWizard() != null); + if (haveWizard) copyLogBtn.setAttribute("wizardCanCopyLog", true); - copyLogBtn.removeAttribute("hidden"); + if (!gRestoreAfterHelpPanelID) + copyLogBtn.removeAttribute("hidden"); // Show button if help is not open. if (aHaveErrorOrWarning) { - var clz = copyLogBtn.getAttribute("class"); + let clz = copyLogBtn.getAttribute("class"); if (!clz) copyLogBtn.setAttribute("class", "torWarning"); else if (clz.indexOf("torWarning") < 0) @@ -549,14 +548,12 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - if (!getWizard()) - return; - - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (!copyLogBtn) return; - if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + // Always show button in non-wizard case; conditionally in wizard. + if (!getWizard() || copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); else copyLogBtn.setAttribute("hidden", true); @@ -735,11 +732,12 @@ function onOpenHelp() showPanel("bridgeHelp"); + showOrHideButton("extra2", false, false); // Hide "Copy Tor Log To Clipboard" + if (getWizard()) { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -755,11 +753,12 @@ function closeHelp() if (!gRestoreAfterHelpPanelID) // Already closed? return; + restoreCopyLogVisibility(); + if (getWizard()) { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[chutney/master] Be more explicit about using python2
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit cb01a3eea0ca28130fa46f9b3f3bf4948b40d895 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Fri Aug 15 14:22:34 2014 +0200 Be more explicit about using python2 Also, normalize the use of env --- chutney | 2 +- lib/chutney/Templating.py | 2 +- lib/chutney/TorNet.py | 2 +- lib/chutney/Traffic.py | 2 +- lib/chutney/__init__.py | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/chutney b/chutney index ade7b6e..b4c1370 100755 --- a/chutney +++ b/chutney @@ -1,4 +1,4 @@ #!/bin/sh export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}" -${PYTHON:=python} -m chutney.TorNet $* +${PYTHON:=python2} -m chutney.TorNet $* diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py index 48ca44a..281a500 100644 --- a/lib/chutney/Templating.py +++ b/lib/chutney/Templating.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Copyright 2011 Nick Mathewson, Michael Stone # diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 9d8efd1..bee4619 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Copyright 2011 Nick Mathewson, Michael Stone # Copyright 2013 The Tor Project diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 57250f7..8467b28 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2013 The Tor Project # diff --git a/lib/chutney/__init__.py b/lib/chutney/__init__.py index 139597f..8b13789 100644 --- a/lib/chutney/__init__.py +++ b/lib/chutney/__init__.py @@ -1,2 +1 @@ -

1 0

[chutney/master] Properly pass all arguments to TorNet
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit 0233979e2c02f44dbd4899fd7a88688b925f2e36 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Fri Aug 15 14:24:52 2014 +0200 Properly pass all arguments to TorNet Using $* without quotes would lead to splitting parameters with spaces --- chutney | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chutney b/chutney index b4c1370..4a26464 100755 --- a/chutney +++ b/chutney @@ -1,4 +1,4 @@ #!/bin/sh export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}" -${PYTHON:=python2} -m chutney.TorNet $* +${PYTHON:=python2} -m chutney.TorNet "$@"

1 0

[chutney/master] Don't break PYTHONPATHs with spaces
by nickm＠torproject.org 19 Aug '14

19 Aug '14

commit 2c25d7cf66dc59873677031a97d9a1a24a3524cd Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Fri Aug 15 14:18:32 2014 +0200 Don't break PYTHONPATHs with spaces --- chutney | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chutney b/chutney index 344118d..ade7b6e 100755 --- a/chutney +++ b/chutney @@ -1,6 +1,4 @@ #!/bin/sh - -PYTHONPATH="`dirname $0`/lib":${PYTHONPATH} -export PYTHONPATH +export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}" ${PYTHON:=python} -m chutney.TorNet $*

1 0