March 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Use option name --test-commandline in tor-fw-helper.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 03efe54027e214be51f5cb4bafcbbd57422da7a1 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 13 00:43:21 2013 -0700 Use option name --test-commandline in tor-fw-helper. It was previously --Test in the help output and --test-commandline in the getopt call. The man page already had --test. (Originally by David, who resolved the tie in favor of "--test"; I chose --test-commandline" instead so that nothing that depended on it could break. -Nick) --- changes/bug7768 | 4 ++-- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug7768 b/changes/bug7768 index f523b5b..e3f9600 100644 --- a/changes/bug7768 +++ b/changes/bug7768 @@ -1,3 +1,3 @@ o Documentation fixes: - - Update tor-fw-helper.1.txt to describe its options with their - correct names. Fixes bug 7768. + - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option + names match. Fixes bug 7768. diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index d92445e..488fe67 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -97,7 +97,7 @@ usage(void) { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" " [-p|--forward-port ([<external port>]:<internal port>])\n");

1 0

[tor/maint-0.2.4] Fix option names in tor-fw-helper manpage
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 17:57:27 2013 -0400 Fix option names in tor-fw-helper manpage fix for bug 7768 --- changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/bug7768 b/changes/bug7768 new file mode 100644 index 0000000..f523b5b --- /dev/null +++ b/changes/bug7768 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Update tor-fw-helper.1.txt to describe its options with their + correct names. Fixes bug 7768. diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index cf769d9..f51ffc4 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -15,8 +15,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- **tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] - -i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_] - [-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_] + [-p __external port__:__internal_port__] DESCRIPTION ----------- @@ -31,7 +30,7 @@ OPTIONS **-h** or **--help**:: Display help text and exit. -**-v**:: +**-v** or **--verbose**:: Display verbose output. **-T** or **--test**:: @@ -41,8 +40,9 @@ OPTIONS **-g** or **--fetch-public-ip**:: Fetch the the public ip address for each supported NAT helper method. -**-p** or **--forward-port** __external_port__:__internal_port__:: - Forward external_port to internal_port. +**-p** or **--port** __external_port__:__internal_port__:: + Forward external_port to internal_port. This option can appear + more than once. BUGS ----

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 60d14421363bdbeee337ba69b21640058a26a6bd Merge: 8d29866 6fe4e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:47 2013 -0400 Merge remote-tracking branch 'public/bug7768' into maint-0.2.4 changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 14 +++++++------- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --cc src/tools/tor-fw-helper/tor-fw-helper.c index adeb63b,488fe67..bb6e70a --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@@ -97,10 -97,10 +97,10 @@@ usage(void { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" - " [-p|--forward-port ([<external port>]:<internal port>])\n"); + " [-p|--forward-port ([<external port>]:<internal port>)]\n"); } /** Log commandline options to a hardcoded file <b>tor-fw-helper.log</b> in the

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 Mar '13

19 Mar '13

commit e61f2ba5e15bb88a7ce4ffa201b483d14f8d1628 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 19 18:46:03 2013 +0000 Update translations for https_everywhere --- eo/https-everywhere.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index 848a195..af24b06 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.dtd @@ -1,14 +1,14 @@ <!ENTITY https-everywhere.about.title "Pri "HTTPS Everywhere""> -<!ENTITY https-everywhere.about.ext_name ""> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Ĉifrigu la TTT‐on! Aŭtomate aktivigas HTTPS‐sekurigon ĉe multaj retejoj."> <!ENTITY https-everywhere.about.version "Versio"> <!ENTITY https-everywhere.about.created_by "Kreita de"> <!ENTITY https-everywhere.about.librarians ""> <!ENTITY https-everywhere.about.thanks "Dankon al"> -<!ENTITY https-everywhere.about.contribute "Se vi volas "HTTPS Everywhere", vi devus konsideri"> -<!ENTITY https-everywhere.about.donate_tor "Donacante al Tor"> +<!ENTITY https-everywhere.about.contribute "Se vi ŝatas "HTTPS Everywhere", vi devus konsideri"> +<!ENTITY https-everywhere.about.donate_tor "Donaci al Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "Donacante al EFF"> +<!ENTITY https-everywhere.about.donate_eff "Donaci al EFF"> <!ENTITY https-everywhere.menu.about "Pri HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory ""> @@ -26,9 +26,9 @@ <!ENTITY https-everywhere.prefs.enabled "Ŝaltita"> <!ENTITY https-everywhere.prefs.ruleset_howto ""> <!ENTITY https-everywhere.prefs.here_link "ĉi tie"> -<!ENTITY https-everywhere.prefs.toggle ""> +<!ENTITY https-everywhere.prefs.toggle "ŝalti/malŝalti"> <!ENTITY https-everywhere.prefs.reset_default ""> -<!ENTITY https-everywhere.prefs.view_xml_source ""> +<!ENTITY https-everywhere.prefs.view_xml_source "Vidi XML ar̂hivon"> <!ENTITY https-everywhere.source.downloading "Elŝutante"> <!ENTITY https-everywhere.source.filename "Arĥivonomo">

1 0

[tor/master] Check for CPUs more accurartely when ONLN != CONF.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 22804c0391f0549356959e1b474c43bfcba1b8cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 02:31:53 2013 -0500 Check for CPUs more accurartely when ONLN != CONF. There are two ways to use sysconf to ask about the number of CPUs. When we're on a VM, we would sometimes get it wrong by asking for the number of total CPUs (say, 64) when we should have been asking for the number of CPUs online (say, 1 or 2). Fix for bug 8002. --- changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/changes/bug8002 b/changes/bug8002 new file mode 100644 index 0000000..d6e2ff2 --- /dev/null +++ b/changes/bug8002 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When autodetecting the number of CPUs, use the number of available + CPUs in preferernce to the number of configured CPUs. Inform the + user if this reduces the number of avialable CPUs. Fix for bug 8002. + Bugfix on 0.2.3.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d7ce894..e620653 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2265,8 +2265,33 @@ compute_num_cpus_impl(void) return (int)info.dwNumberOfProcessors; else return -1; -#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) - long cpus = sysconf(_SC_NPROCESSORS_CONF); +#elif defined(HAVE_SYSCONF) +#ifdef _SC_NPROCESSORS_CONF + long cpus_conf = sysconf(_SC_NPROCESSORS_CONF); +#else + long cpus_conf = -1; +#endif +#ifdef _SC_NPROCESSORS_ONLN + long cpus_onln = sysconf(_SC_NPROCESSORS_ONLN); +#else + long cpus_onln = -1; +#endif + long cpus = -1; + + if (cpus_conf > 0 && cpus_onln < 0) { + cpus = cpus_conf; + } else if (cpus_onln > 0 && cpus_conf < 0) { + cpus = cpus_onln; + } else if (cpus_onln > 0 && cpus_conf > 0) { + if (cpus_onln < cpus_conf) { + log_notice(LD_GENERAL, "I think we have %ld CPUS, but only %ld of them " + "are available. Telling Tor to only use %ld. You can over" + "ride this with the NumCPUs option", + cpus_conf, cpus_onln, cpus_onln); + } + cpus = cpus_onln; + } + if (cpus >= 1 && cpus < INT_MAX) return (int)cpus; else

1 0

[tor/master] Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 8d29866bec821e188a411f78b8112d2097ed106c Merge: de7e99f 22804c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:26:45 2013 -0400 Merge remote-tracking branch 'public/bug8002' into maint-0.2.4 changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 01af92fedead7589ac4272558d284e0e68de7ddd Merge: 084c857 8d29866 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:27:00 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Check for CPUs more accurartely when ONLN != CONF.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 22804c0391f0549356959e1b474c43bfcba1b8cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 02:31:53 2013 -0500 Check for CPUs more accurartely when ONLN != CONF. There are two ways to use sysconf to ask about the number of CPUs. When we're on a VM, we would sometimes get it wrong by asking for the number of total CPUs (say, 64) when we should have been asking for the number of CPUs online (say, 1 or 2). Fix for bug 8002. --- changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/changes/bug8002 b/changes/bug8002 new file mode 100644 index 0000000..d6e2ff2 --- /dev/null +++ b/changes/bug8002 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When autodetecting the number of CPUs, use the number of available + CPUs in preferernce to the number of configured CPUs. Inform the + user if this reduces the number of avialable CPUs. Fix for bug 8002. + Bugfix on 0.2.3.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d7ce894..e620653 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2265,8 +2265,33 @@ compute_num_cpus_impl(void) return (int)info.dwNumberOfProcessors; else return -1; -#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) - long cpus = sysconf(_SC_NPROCESSORS_CONF); +#elif defined(HAVE_SYSCONF) +#ifdef _SC_NPROCESSORS_CONF + long cpus_conf = sysconf(_SC_NPROCESSORS_CONF); +#else + long cpus_conf = -1; +#endif +#ifdef _SC_NPROCESSORS_ONLN + long cpus_onln = sysconf(_SC_NPROCESSORS_ONLN); +#else + long cpus_onln = -1; +#endif + long cpus = -1; + + if (cpus_conf > 0 && cpus_onln < 0) { + cpus = cpus_conf; + } else if (cpus_onln > 0 && cpus_conf < 0) { + cpus = cpus_onln; + } else if (cpus_onln > 0 && cpus_conf > 0) { + if (cpus_onln < cpus_conf) { + log_notice(LD_GENERAL, "I think we have %ld CPUS, but only %ld of them " + "are available. Telling Tor to only use %ld. You can over" + "ride this with the NumCPUs option", + cpus_conf, cpus_onln, cpus_onln); + } + cpus = cpus_onln; + } + if (cpus >= 1 && cpus < INT_MAX) return (int)cpus; else

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 8d29866bec821e188a411f78b8112d2097ed106c Merge: de7e99f 22804c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:26:45 2013 -0400 Merge remote-tracking branch 'public/bug8002' into maint-0.2.4 changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

r26122: {website} update obfsproxy bundle packages (website/trunk/include)
by Erinn Clark 19 Mar '13

19 Mar '13

Author: erinn Date: 2013-03-19 18:24:18 +0000 (Tue, 19 Mar 2013) New Revision: 26122 Modified: website/trunk/include/versions.wmi Log: update obfsproxy bundle packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-03-19 17:15:17 UTC (rev 26121) +++ website/trunk/include/versions.wmi 2013-03-19 18:24:18 UTC (rev 26122) @@ -33,7 +33,7 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundlealpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundlealpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-5</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-5</define-tag> @@ -44,8 +44,8 @@ <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.11-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-5</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-5</define-tag> @@ -55,8 +55,8 @@ <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.11-alpha-1</define-tag> +<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.21</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0