- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit d4a61c76a1f4e21671cb93c1d5df1e31f9adc117 Merge: 78c610e cba1d29 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 15:21:27 2011 -0400 Merge branch 'maint-0.2.2' Conflicts: src/or/dirserv.h src/or/circuituse.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] make make check-spaces happier.
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit cba1d29b7ff041dc222d69640f4d4330d31f7ea1 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 15:18:34 2011 -0400 make make check-spaces happier. (still not happy.) --- src/or/circuituse.c | 9 +++++---- src/or/dirserv.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fd1cf6b..8503dae 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -433,11 +433,11 @@ circuit_expire_building(void) "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d (%s)", (long)(now.tv_sec - victim->timestamp_created.tv_sec), - victim->purpose, + victim->purpose, circuit_purpose_to_string(victim->purpose)); } else if (circuit_build_times_count_close(&circ_times, - first_hop_succeeded, - victim->timestamp_created.tv_sec)) { + first_hop_succeeded, + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -770,7 +770,8 @@ circuit_expire_old_circuits_clientside(void) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < + now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", diff --git a/src/or/dirserv.h b/src/or/dirserv.h index a8a7060..569abfc 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -52,7 +52,7 @@ MAX_V_LINE_LEN \ ) -#define UNNAMED_ROUTER_NICKNAME "Unnamed" +#define UNNAMED_ROUTER_NICKNAME "Unnamed" int connection_dirserv_flushed_some(dir_connection_t *conn);

1 0

[tor/master] Fix double-free bug in microdesc parser
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 247cbab6c8a37c5e6225bfd60491b071a29331e4 Author: cypherpunks <writecode(a)127.0.0.1> Date: Wed Apr 27 11:10:56 2011 -0700 Fix double-free bug in microdesc parser --- changes/microdesc-double-free | 7 +++++++ src/or/routerparse.c | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/microdesc-double-free b/changes/microdesc-double-free new file mode 100644 index 0000000..932cc75 --- /dev/null +++ b/changes/microdesc-double-free @@ -0,0 +1,7 @@ + o Security fixes: + - Don't double-free a parsable, but invalid, microdescriptor, even + if it is followed in the blob we're parsing by an unparsable + microdescriptor. Fixes an issue reported in a comment on bug 2954. + Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ba29f05..d0138e6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4357,6 +4357,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md = NULL; next: microdesc_free(md); + md = NULL; memarea_clear(area); smartlist_clear(tokens);

1 0

[tor/master] minor tweaks to manpage
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 0f48e8fa9ad68f56c7b1076872848bd0f1e524b2 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 14:04:50 2011 -0400 minor tweaks to manpage --- doc/tor.1.txt | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 866a702..04a0537 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -511,7 +511,7 @@ The following options are useful only for clients (that is, if patterns of nodes to never use when picking an exit node---that is, a node that delivers traffic for you outside the Tor network. Note that any node listed in ExcludeNodes is automatically considered to be part of this - list too. See also the caveats on the "ExitNodes" option below + list too. See also the caveats on the "ExitNodes" option below. **ExitNodes** __node__,__node__,__...__:: @@ -527,18 +527,20 @@ The following options are useful only for clients (that is, if Note also that not every circuit is used to deliver traffic outside of the Tor network. It is normal to see non-exit circuits (such as those used to connect to hidden services, those that do directory fetches, - those used for self-tests, and so on) that end at a non-exit node. To + those used for relay reachability self-tests, and so on) that end + at a non-exit node. To keep a node from being used entirely, see ExcludeNodes and StrictNodes. + + The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + + - The .exit address notation, if enabled, overrides this option. + The .exit address notation, if enabled via AllowDotExit, overrides + this option. **EntryNodes** __node__,__node__,__...__:: A list of identity fingerprints and nicknames of nodes to use for the first hop in your normal circuits. (Country codes and - address patterns are not yet supported.) This includes all + address patterns are not yet supported.) Normal circuits include all circuits except for direct connections to directory servers. The Bridge option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. + @@ -553,7 +555,7 @@ The following options are useful only for clients (that is, if still try to avoid nodes in the ExcludeNodes list, but it will err on the side of avoiding unexpected errors. Specifically, StrictNodes 0 tells Tor that it is okay to use an excluded node when it is *necessary* to - perform self-tests, connect to + perform relay reachability self-tests, connect to a hidden service, provide a hidden service to a client, fulfill a .exit request, upload directory information, or download directory information. (Default: 0)

1 0

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

27 Apr '11

commit 78c610eea9472348634e05b49f9d3a9f4dcc221c Merge: 8b686d9 247cbab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 15:20:01 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: doc/tor.1.txt changes/microdesc-double-free | 7 +++++++ doc/tor.1.txt | 12 +++++++----- src/or/routerparse.c | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --cc doc/tor.1.txt index f24eaba,04a0537..8599fdc --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -529,8 -511,9 +529,8 @@@ The following options are useful only f patterns of nodes to never use when picking an exit node---that is, a node that delivers traffic for you outside the Tor network. Note that any node listed in ExcludeNodes is automatically considered to be part of this - list too. See also the caveats on the "ExitNodes" option below + list too. See also the caveats on the "ExitNodes" option below. - **ExitNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use as exit node---that is, a @@@ -550,12 -534,13 +551,13 @@@ The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + + - The .exit address notation, if enabled, overrides this option. + The .exit address notation, if enabled via AllowDotExit, overrides + this option. **EntryNodes** __node__,__node__,__...__:: - A list of identity fingerprints and nicknames of nodes - to use for the first hop in your normal circuits. (Country codes and - address patterns are not yet supported.) Normal circuits include all + A list of identity fingerprints, nicknames, and country codes of nodes + to use for the first hop in your normal circuits. - This includes all ++ Normal circuits include all circuits except for direct connections to directory servers. The Bridge option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. +

1 0

[tor/maint-0.2.2] make make check-spaces happier.
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit cba1d29b7ff041dc222d69640f4d4330d31f7ea1 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 15:18:34 2011 -0400 make make check-spaces happier. (still not happy.) --- src/or/circuituse.c | 9 +++++---- src/or/dirserv.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fd1cf6b..8503dae 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -433,11 +433,11 @@ circuit_expire_building(void) "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d (%s)", (long)(now.tv_sec - victim->timestamp_created.tv_sec), - victim->purpose, + victim->purpose, circuit_purpose_to_string(victim->purpose)); } else if (circuit_build_times_count_close(&circ_times, - first_hop_succeeded, - victim->timestamp_created.tv_sec)) { + first_hop_succeeded, + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -770,7 +770,8 @@ circuit_expire_old_circuits_clientside(void) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < + now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", diff --git a/src/or/dirserv.h b/src/or/dirserv.h index a8a7060..569abfc 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -52,7 +52,7 @@ MAX_V_LINE_LEN \ ) -#define UNNAMED_ROUTER_NICKNAME "Unnamed" +#define UNNAMED_ROUTER_NICKNAME "Unnamed" int connection_dirserv_flushed_some(dir_connection_t *conn);

1 0

[tor/maint-0.2.2] Fix double-free bug in microdesc parser
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 247cbab6c8a37c5e6225bfd60491b071a29331e4 Author: cypherpunks <writecode(a)127.0.0.1> Date: Wed Apr 27 11:10:56 2011 -0700 Fix double-free bug in microdesc parser --- changes/microdesc-double-free | 7 +++++++ src/or/routerparse.c | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/microdesc-double-free b/changes/microdesc-double-free new file mode 100644 index 0000000..932cc75 --- /dev/null +++ b/changes/microdesc-double-free @@ -0,0 +1,7 @@ + o Security fixes: + - Don't double-free a parsable, but invalid, microdescriptor, even + if it is followed in the blob we're parsing by an unparsable + microdescriptor. Fixes an issue reported in a comment on bug 2954. + Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ba29f05..d0138e6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4357,6 +4357,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md = NULL; next: microdesc_free(md); + md = NULL; memarea_clear(area); smartlist_clear(tokens);

1 0

[tor/release-0.2.2] make the bug2971 changes entry say its bug number
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 9ba83862ab4ee636ef47eaf5d50b380ed2ffe7b9 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 14:49:42 2011 -0400 make the bug2971 changes entry say its bug number now when i append all the changes files to ChangeLog, it won't be stranded and unnumbered --- changes/bug2971 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug2971 b/changes/bug2971 index 8b71ce0..8b6036e 100644 --- a/changes/bug2971 +++ b/changes/bug2971 @@ -2,5 +2,5 @@ - Be more consistent in our treatment of file system paths. ~ should get expanded to the user's home directory in the Log config option. Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and - --DataDirectory options. + --DataDirectory options. Fixes bug 2971.

1 0

[tor/release-0.2.2] fixups on the bug1090-general changes
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit ee713b046cdd58e695db821bc643a0467acb52e9 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 14:38:55 2011 -0400 fixups on the bug1090-general changes --- changes/bug1090-general | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug1090-general b/changes/bug1090-general index 4656315..2ca5493 100644 --- a/changes/bug1090-general +++ b/changes/bug1090-general @@ -12,7 +12,7 @@ . "Exit", in the context of ExitNodes and ExcludeExitNodes, means a node that delivers user traffic outside the Tor network. - . "Entry", in the context of EntryNodes and ExcludeEntryNodes, + . "Entry", in the context of EntryNodes, means a node used as the first hop of a multihop circuit: it doesn't include direct connections to directory servers. . "ExcludeNodes" applies to all nodes. @@ -48,9 +48,10 @@ and to rendezvous points selected by hidden service users. This can make your hidden service less reliable: use it with caution! - . If we have used ExcludeNodes on ourself, do not try self-tests. + . If we have used ExcludeNodes on ourself, do not try relay + reachability self-tests. . If we have excluded all the directory authorities, we will - not even try to upload our descriptor if we're a server. + not even try to upload our descriptor if we're a relay. . Do not honor .exit requests to an excluded node. - Remove a misfeature that caused us to ignore the Fast/Stable flags

1 0

[tor/master] Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 99621bc5a629a81a5a823ce21ac3d967443d0e12 Merge: 8f6cb93 0c40dda Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 13:45:28 2011 -0400 Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed src/or/rendclient.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0