- tor-commits - lists.torproject.org

[tor/release-0.2.2] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit 5f93885cde396fd00462e450dd00abb36f90975d Merge: 877e177 2bf0e74 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 6 20:55:27 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug3898a | 6 ++++++ changes/bug3923 | 5 +++++ changes/msvc_lround | 4 ++++ doc/tor.1.txt | 19 ++++++++++--------- src/common/util.c | 4 ++++ src/or/connection_edge.c | 10 ++++------ 6 files changed, 33 insertions(+), 15 deletions(-)

1 0

[tor/release-0.2.2] Fix assertion in addressmap_clear_excluded_trackexithosts
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit 2bf0e7479bc9ec26496405ff6a1ef830cacc001b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:26:20 2011 -0400 Fix assertion in addressmap_clear_excluded_trackexithosts Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac. --- changes/bug3923 | 5 +++++ src/or/connection_edge.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/bug3923 b/changes/bug3923 new file mode 100644 index 0000000..9c0e138 --- /dev/null +++ b/changes/bug3923 @@ -0,0 +1,5 @@ + o Major bugfies: + - Avoid an assertion failure when reloading a configuration with + TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes + bug 3923; bugfix on 0.2.2.25-alpha. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d4d7e1c..8609b02 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -842,12 +842,10 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) if (len < 6) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ - dot = strrchr(dot, '.'); /* dot now points to the . before .exit or NULL */ - if (!dot) { - nodename = tor_strndup(target, len-5); - } else { - nodename = tor_strndup(dot+1, strlen(dot+1)-5); - } + while(dot > target && *dot != '.') + dot--; + if (*dot == '.') dot++; + nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0); tor_free(nodename); if (!ri ||

1 0

[tor/release-0.2.2] lround() missing in MSVC
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit 5939c09d35de5be4b135bb0ad6dde24700e75fc2 Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Wed Aug 24 13:52:44 2011 -0400 lround() missing in MSVC lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch. --- changes/msvc_lround | 4 ++++ src/common/util.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/msvc_lround b/changes/msvc_lround new file mode 100644 index 0000000..e4aea95 --- /dev/null +++ b/changes/msvc_lround @@ -0,0 +1,4 @@ + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + diff --git a/src/common/util.c b/src/common/util.c index b47b9c5..ee0acbb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,7 +334,11 @@ tor_mathlog(double d) long tor_lround(double d) { +#ifdef _MSC_VER + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#else return lround(d); +#endif } /** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 9ef2cd7776ecb91b74c1db58d8fbd9111238f458 Merge: 7ca16af 2bf0e74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:55:31 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection_edge.c Conflicted on a router->node transition; fix was easy. changes/bug3923 | 5 +++++ src/or/connection_edge.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --cc src/or/connection_edge.c index 72c4224,8609b02..7028764 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -930,17 -842,15 +930,15 @@@ addressmap_clear_excluded_trackexithost if (len < 6) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ - dot = strrchr(dot, '.'); /* dot now points to the . before .exit or NULL */ - if (!dot) { - nodename = tor_strndup(target, len-5); - } else { - nodename = tor_strndup(dot+1, strlen(dot+1)-5); - } + while(dot > target && *dot != '.') + dot--; + if (*dot == '.') dot++; + nodename = tor_strndup(dot, len-5-(dot-target));; - ri = router_get_by_nickname(nodename, 0); + node = node_get_by_nickname(nodename, 0); tor_free(nodename); - if (!ri || - (allow_nodes && !routerset_contains_router(allow_nodes, ri)) || - routerset_contains_router(exclude_nodes, ri) || + if (!node || + (allow_nodes && !routerset_contains_node(allow_nodes, node)) || + routerset_contains_node(exclude_nodes, node) || !hostname_in_track_host_exits(options, address)) { /* We don't know this one, or we want to be rid of it. */ addressmap_ent_remove(address, ent);

1 0

[tor/master] Fix assertion in addressmap_clear_excluded_trackexithosts
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 2bf0e7479bc9ec26496405ff6a1ef830cacc001b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:26:20 2011 -0400 Fix assertion in addressmap_clear_excluded_trackexithosts Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac. --- changes/bug3923 | 5 +++++ src/or/connection_edge.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/bug3923 b/changes/bug3923 new file mode 100644 index 0000000..9c0e138 --- /dev/null +++ b/changes/bug3923 @@ -0,0 +1,5 @@ + o Major bugfies: + - Avoid an assertion failure when reloading a configuration with + TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes + bug 3923; bugfix on 0.2.2.25-alpha. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d4d7e1c..8609b02 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -842,12 +842,10 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) if (len < 6) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ - dot = strrchr(dot, '.'); /* dot now points to the . before .exit or NULL */ - if (!dot) { - nodename = tor_strndup(target, len-5); - } else { - nodename = tor_strndup(dot+1, strlen(dot+1)-5); - } + while(dot > target && *dot != '.') + dot--; + if (*dot == '.') dot++; + nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0); tor_free(nodename); if (!ri ||

1 0

[torspec/master] Resume documenting the dot-noconnect syntax
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit 06cf12f86e398318deec2338c1551a0312097f14 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 6 20:24:19 2011 -0400 Resume documenting the dot-noconnect syntax Just because it's gone from 0.2.2.x doesn't mean we should undocument it. Manually reverts (and modifies) c148e13154b81. --- address-spec.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/address-spec.txt b/address-spec.txt index ce6d2b6..2b361d1 100644 --- a/address-spec.txt +++ b/address-spec.txt @@ -56,3 +56,16 @@ When Tor sees an address in this format, it tries to look up and connect to the specified hidden service. See rend-spec.txt for full details. +4. .noconnect + + SYNTAX: [string].noconnect + + When Tor sees an address in this format, it immediately closes the + connection without attaching it to any circuit. This is useful for + controllers that want to test whether a given application is indeed + using the same instance of Tor that they're controlling. + + This feature was added in Tor 0.1.2.4-alpha, and taken out in Tor + 0.2.2.1-alpha over fears that it provided another avenue for detecting + Tor users via application-level web tricks. +

1 0

[tor/maint-0.2.2] Fix assertion in addressmap_clear_excluded_trackexithosts
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 2bf0e7479bc9ec26496405ff6a1ef830cacc001b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:26:20 2011 -0400 Fix assertion in addressmap_clear_excluded_trackexithosts Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac. --- changes/bug3923 | 5 +++++ src/or/connection_edge.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/bug3923 b/changes/bug3923 new file mode 100644 index 0000000..9c0e138 --- /dev/null +++ b/changes/bug3923 @@ -0,0 +1,5 @@ + o Major bugfies: + - Avoid an assertion failure when reloading a configuration with + TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes + bug 3923; bugfix on 0.2.2.25-alpha. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d4d7e1c..8609b02 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -842,12 +842,10 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) if (len < 6) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ - dot = strrchr(dot, '.'); /* dot now points to the . before .exit or NULL */ - if (!dot) { - nodename = tor_strndup(target, len-5); - } else { - nodename = tor_strndup(dot+1, strlen(dot+1)-5); - } + while(dot > target && *dot != '.') + dot--; + if (*dot == '.') dot++; + nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0); tor_free(nodename); if (!ri ||

1 0

[torbrowser/maint-2.2] change pipelining value to 8 to match the source code
by erinn＠torproject.org 07 Sep '11

07 Sep '11

commit 7c4f334bb59dd151b4ffc49a0b5bd69f41461f91 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Sep 7 01:19:54 2011 +0100 change pipelining value to 8 to match the source code --- build-scripts/config/no-polipo-4.0.js | 2 +- build-scripts/config/windows-4.0.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 908402d..88374ff 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -100,7 +100,7 @@ user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); user_pref("network.http.pipelining", true); -user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.maxrequests", 8); user_pref("network.http.pipelining.ssl", true); user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 3029145..c07b4f7 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -108,7 +108,7 @@ user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); user_pref("network.http.pipelining", true); -user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.maxrequests", 8); user_pref("network.http.pipelining.ssl", true); user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", "");

1 0

[pytorctl/master] NOTICE when git repo not found rather than ERROR
by mikeperry＠torproject.org 06 Sep '11

06 Sep '11

commit 097a95c4185b086dbac67e0d2618bd15b9f41521 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Sep 1 13:53:22 2011 -0700 NOTICE when git repo not found rather than ERROR --- TorUtil.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index 50258e5..73ea2a8 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -426,7 +426,7 @@ def get_git_version(path_to_repo): ref = f.readline().strip().split(' ') f.close() except IOError, e: - plog('ERROR', e) + plog('NOTICE', 'Git Repo at %s Not Found' % path_to_repo) return ('unknown','unknown') try: f = open(path_to_repo+ref[1]) @@ -435,7 +435,8 @@ def get_git_version(path_to_repo): f.close() return (branch, head) except IOError, e: - plog('ERROR', e) + pass except IndexError, e: - plog('ERROR', e) + pass + plog('NOTICE', 'Git Repo at %s Not Found' % path_to_repo) return ('unknown','unknown')

1 0