- tor-commits - lists.torproject.org

[torflow/master] revert fix for 3798
by mikeperry＠torproject.org 06 Sep '11

06 Sep '11

commit 01e268c7cb272bd5bb53d2f41783c16c1918461f Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 6 14:38:01 2011 -0700 revert fix for 3798 The fix for 3798 (https://trac.torproject.org/projects/tor/ticket/3798) introduced a new error: TorCtl.Connection.close() at program exit will occasionally cause BwAuthority to hang indefinitely. This issue was originally reported in ticket 3834 (https://trac.torproject.org/projects/tor/ticket/3834) TorCtl.Connection.close() should not be used at this time. The issue occurs when called in either atexit handlers as well as at the end of the main thread. --- NetworkScanners/BwAuthority/bwauthority_child.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 3aa13b2..f842843 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -338,11 +338,7 @@ def ignore_streams(c,hdlr): s.ignored = True hdlr.streams[s.strm_id] = s -def cleanup(c): - if c: - c.close() - c.block_until_close() - +def cleanup(): plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file): @@ -367,7 +363,7 @@ def setup_handler(out_dir, cookie_file): TorCtl.EVENT_TYPE.CIRC, TorCtl.EVENT_TYPE.STREAM_BW], True) - atexit.register(cleanup, c) + atexit.register(cleanup) return (c,h) def usage(argv):

1 0

[torflow/master] Submodule..
by mikeperry＠torproject.org 06 Sep '11

06 Sep '11

commit 5736529160df12435fb39d11f81a5da92f74d615 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 6 18:16:48 2011 -0700 Submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index a3ed3d0..e99394c 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa +Subproject commit e99394c46b30ed73ffbf02d5c6a39bf9b04416a2

1 0

[tor/release-0.2.2] fold in changes files so far
by arma＠torproject.org 06 Sep '11

06 Sep '11

commit c79db17ec1982fdd871907cc925efd1e90a318a7 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 6 20:56:42 2011 -0400 fold in changes files so far --- ChangeLog | 18 ++++++++++++++++++ changes/bug3898a | 6 ------ changes/bug3923 | 5 ----- changes/msvc_lround | 4 ---- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b25816..58c17a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Changes in version 0.2.2.33 - 2011-09-?? + 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. + + 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. + + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + + Changes in version 0.2.2.32 - 2011-08-27 The Tor 0.2.2 release series is dedicated to the memory of Andreas Pfitzmann (1958-2010), a pioneer in anonymity and privacy research, diff --git a/changes/bug3898a b/changes/bug3898a deleted file mode 100644 index d40445e..0000000 --- a/changes/bug3898a +++ /dev/null @@ -1,6 +0,0 @@ - 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/changes/bug3923 b/changes/bug3923 deleted file mode 100644 index 9c0e138..0000000 --- a/changes/bug3923 +++ /dev/null @@ -1,5 +0,0 @@ - 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/changes/msvc_lround b/changes/msvc_lround deleted file mode 100644 index e4aea95..0000000 --- a/changes/msvc_lround +++ /dev/null @@ -1,4 +0,0 @@ - o Build fixes: - - Provide a substitute implementation of lround() for MSVC, which - apparently lacks it. Patch from Gisle Vanem. -

1 0

[tor/release-0.2.2] Mention that HiddenServiceDir must exist
by arma＠torproject.org 06 Sep '11

06 Sep '11

commit cc33ac362b1e0e046ddbeae30da1810aef781e8f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 25 22:26:54 2011 +0200 Mention that HiddenServiceDir must exist --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f80c9f..bfc9766 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1339,7 +1339,7 @@ The following options are used to configure a hidden service. **HiddenServiceDir** __DIRECTORY__:: Store data files for a hidden service in DIRECTORY. Every hidden service must have a separate directory. You may use this option multiple times to - specify multiple services. + specify multiple services. DIRECTORY must be an existing directory. **HiddenServicePort** __VIRTPORT__ [__TARGET__]:: Configure a virtual port VIRTPORT for a hidden service. You may use this

1 0

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

06 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 06 Sep '11

06 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 06 Sep '11

06 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 06 Sep '11

06 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 06 Sep '11

06 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 06 Sep '11

06 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