- tor-commits - lists.torproject.org

[tor/release-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/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit ed808143682bbd151df9ff84efffa084a36e6b33 Merge: 4bb1f69 cba1d29 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 15:55:07 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/microdesc-double-free | 7 +++++++ src/or/circuituse.c | 9 +++++---- src/or/dirserv.h | 2 +- src/or/routerparse.c | 1 + 4 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.2] fold in recent changes entries
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 4bb1f690314b60db13946424f9295291da7ec112 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 15:54:11 2011 -0400 fold in recent changes entries --- ChangeLog | 104 +++++++++++++++++++++++++++++++++++++-- changes/bug1090-general | 74 ---------------------------- changes/bug1090-launch-warning | 5 -- changes/bug2704 | 5 -- changes/bug2704_part1 | 5 -- changes/bug2704_part2 | 5 -- changes/bug2750 | 6 -- changes/bug2899 | 4 -- changes/bug2917 | 4 -- changes/bug2933 | 4 -- changes/bug2948 | 7 --- changes/bug2971 | 6 -- changes/bug2979 | 9 ---- changes/exitnodes_reliable | 7 --- 14 files changed, 98 insertions(+), 147 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca782b1..684a917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,86 @@ -Changes in version 0.2.2.25-alpha - 2011-04-?? +Changes in version 0.2.2.25-alpha - 2011-04-28 + o Major bugfixes: + - When writing our maximum bw for the current interval to the state + file, don't wrongly inflate that value by a factor of 10 anymore. + Also, resume reading bandwidth history from the state file correctly. + Fixes bug 2704; bugfix on tor-0.2.2.23-alpha. + o Major features: - - Export GeoIP information on usage to bridge controller even if - we have not yet been running for 24 hours. + - Export GeoIP information on bridge usage to controller even if + we have not yet been running for 24 hours. Now Vidalia bridge + operators can get more accurate and immediate feedback about their + contributions to the network. + + o Major features and bugfixes (node selection): + - Revise and unify the meaning of the ExitNodes, EntryNodes, + ExcludeEntryNodes, ExcludeExitNodes, ExcludeNodes, and StrictNodes + options. Previously, we had been ambiguous in describing what + counted as an "exit" node, and what operations exactly "StrictNodes + 0" would permit. This created confusion when people saw nodes + built through unexpected circuits, and made it hard to tell real + bugs from surprises. Now the intended behavior is: + . "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, 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. + . "StrictNodes" changes the behavior of ExcludeNodes only. When + StrictNodes is set, Tor should avoid all nodes listed in + ExcludeNodes, even when it will make user requests fail. When + StrictNodes is *not* set, then Tor should follow ExcludeNodes + whenever it can, except when it must use an excluded node + to perform self-tests, connect to a hidden service, provide + a hidden service, fulfill a .exit request, upload directory + information, or fetch directory information. + Collectively, the changes to implement the behavior fix bug 1090. + - ExcludeNodes now takes precedence over EntryNodes and ExitNodes: + if a node is listed in both, it's treated as excluded. + - ExcludeNodes now applies to directory nodes -- as a preference if + StrictNodes is 0, or an absolute requirement if StrictNodes is 1. + Don't exclude all the directory authorities and set StrictNodes + to 1 unless you really want your Tor to break. + - ExcludeNodes and ExcludeExitNodes now override exit enclaving. + - ExcludeExitNodes now overrides .exit requests. + - We don't use bridges listed in ExcludeNodes. + - When StrictNodes is 1: + . We now apply ExcludeNodes to hidden service introduction points + 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 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 relay. + . Do not honor .exit requests to an excluded node. + - Remove a misfeature that caused us to ignore the Fast/Stable flags + when ExitNodes is set. Bugfix on 0.2.2.7-alpha. + - When the set of permitted nodes changes, we now remove any + mappings introduced via TrackExitHosts to now-excluded nodes. + Bugfix on 0.1.0.1-rc. + - We never cannibalize a circuit that had excluded nodes on it, + even if StrictNodes is 0. Bugfix on 0.1.0.1-rc. + - Revert a change where we would be laxer about attaching streams to + circuits than when building the circuits. This was meant to + prevent a set of bugs where streams were never attachable, but our + improved code here should make this unnecessary. Bugfix on + 0.2.2.7-alpha. + - Keep track of how many times we launch a new circuit to handle + a given stream. Too many launches could indicate an inconsistency + between our "launch a circuit to handle this stream" logic and our + "attach this stream to one of the available circuits" logic. + - Improve log messages related to excluded nodes. o Minor bugfixes: + - Added a forgotten cast that caused a compile warning on OS X 10.6. + Bugfix on 0.2.2.24-alpha. + - If the Nickname configuration option isn't given, Tor would pick + a nickname based on the local hostname as the nickname for a relay. + Because nicknames are not very important in today's Tor and the + "Unnamed" nickname has been implemented, this is now problematic + behavior: It leaks information about the hostname without being + useful at all. Bugfix on 0.1.2.2-alpha, which introduced the + Unnamed nickname. Fixes bug 2979, reported by tagnaq. - Be more careful about reporting the correct error from a failed connect() system call. Under some circumstances, it was possible to look at an incorrect value for errno when sending the end reason. @@ -13,9 +90,24 @@ Changes in version 0.2.2.25-alpha - 2011-04-?? connection in single second. Bugfix on 0.1.2.8-beta. - When a client finds that an origin circuit has run out of 16-bit stream IDs, we now mark it as unusable for new streams. Previously, - we would try to close the entire circuit. Bugfix on Tor 0.0.6. - - Added a forgotten cast that caused a compile warning on OS X - 10.6. Bugfix on 0.2.2.24-alpha. + we would try to close the entire circuit. Bugfix on 0.0.6. + - Correct the warning displayed when a rendezvous descriptor exceeds + the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found + by John Brooks. + - Downgrade "no current certificates known for authority" message from + Notice to Info. Fixes bug 2899; bugfix on 0.2.0.10-alpha. + - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes + bug 2917. Bugfix on 0.1.1.1-alpha. + - Fix an uncommon assertion failure when running with DNSPort under + heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + - Only limit the lengths of single HS descriptors, even when + multiple HS descriptors are published to an HSDir relay in a + single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. + Found by hsdir. + - Be more consistent in our treatment of file system paths. "~" should + get expanded to the user's home directory in the Log config option. + Fixes bug 2971; bugfix on 0.2.0.1-alpha, which introduced the + feature for the -f and --DataDirectory options. o Minor features: - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors. diff --git a/changes/bug1090-general b/changes/bug1090-general deleted file mode 100644 index 2ca5493..0000000 --- a/changes/bug1090-general +++ /dev/null @@ -1,74 +0,0 @@ - o Major features and bugfixes (node selection) - - - Revise and unify the meaning of the ExitNodes, EntryNodes, - ExcludeEntryNodes, ExcludeExitNodes, ExcludeNodes, and - StrictNodes options. Previously, we had been ambiguous in - describing what counted as an "exit" node, and what operations - exactly "StrictNodes 0" would permit. This created confusion - when people saw nodes built through unexpected circuits, and - made it hard to tell real bugs from surprises. We now stipulate - that the intended behavior is: - - . "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, - 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. - . "StrictNodes" changes the behavior of ExcludeNodes only. - When StrictNodes is set, Tor should avoid all nodes listed - in ExcludeNodes, even when it will make user requests - fail. When StrictNodes is *not* set, then Tor should - follow ExcludeNodes whenever it can, except when it must - use an excluded node to perform self-tests, connect to a - hidden service, provide a hidden service, fulfill a .exit - request, upload directory information, or fetch directory - information. - - Collectively, the changes to implement the behavior are a fix for - bug 1090. - - - ExcludeNodes now takes precedence over EntryNodes and ExitNodes: - if a node is listed in both, it's treated as excluded. - - - ExcludeNodes now applies to directory nodes: as a preference if - StrictNodes is 0, or an absolute requirement if StrictNodes is 1. - (Don't exclude all the directory authorities and set StrictNodes - to 1 unless you really want your Tor to break.) - - - ExcludeNodes and ExcludeExitNodes now override exit enclaving. - - - ExcludeExitNodes now overrides .exit requests. - - - We don't use bridges from ExcludeNodes. - - - When StrictNodes is 1: - . We now apply ExcludeNodes to hidden service introduction points - 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 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 relay. - . Do not honor .exit requests to an excluded node. - - - Remove a misfeature that caused us to ignore the Fast/Stable flags - if ExitNodes was set. Bugfix on 0.2.2.7-alpha. - - - When the set of permitted nodes changes, we now remove any - mappings introduced via TrackExitHosts to now-excluded nodes. - Bugfix on 0.1.0.1-rc. - - - We never cannibalize a circuit that had excluded nodes on it, - even if StrictNodes is 0. Bugfix on 0.1.0.1-rc. - - - Improve log messages related to excluded nodes. - - - Revert a change where we would be laxer about attaching streams to - circuits than when building the circuits. This was meant to - prevent a set of bugs where streams were never attachable, but our - improved code here should make this unnecessary. Bugfix on - 0.2.2.7-alpha. - diff --git a/changes/bug1090-launch-warning b/changes/bug1090-launch-warning deleted file mode 100644 index 3f3fbcb..0000000 --- a/changes/bug1090-launch-warning +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Keep track of how many times we launch a new circuit to handle - a given stream. Too many launches could indicate an inconsistency - between our "launch a circuit to handle this stream" logic and our - "attach our stream to one of the available circuits" logic. diff --git a/changes/bug2704 b/changes/bug2704 deleted file mode 100644 index 821b38b..0000000 --- a/changes/bug2704 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - When writing our maximum bw for the current interval to the state - file, don't wrongly inflate that value by a factor of 10 anymore. - Fixes more of bug 2704. - diff --git a/changes/bug2704_part1 b/changes/bug2704_part1 deleted file mode 100644 index eaf2281..0000000 --- a/changes/bug2704_part1 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix an issue causing calculation of Tor's average bandwidth as saved - in the state file to be 10 times smaller than it should be. Fixes the - first part of bug 2704, bugfix on tor-0.2.2.23-alpha. - diff --git a/changes/bug2704_part2 b/changes/bug2704_part2 deleted file mode 100644 index 962c8b7..0000000 --- a/changes/bug2704_part2 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Prevent relays that read their bandwidth history from their state file - from arbitrarily inflating that value. Fixes the second half of bug - 2704, bugfix on tor-0.2.2.23-alpha. - diff --git a/changes/bug2750 b/changes/bug2750 deleted file mode 100644 index 4371a0a..0000000 --- a/changes/bug2750 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - Correct the warning displayed when a rendezvous descriptor exceeds - the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found - by John Brooks. - - diff --git a/changes/bug2899 b/changes/bug2899 deleted file mode 100644 index 6af86d0..0000000 --- a/changes/bug2899 +++ /dev/null @@ -1,4 +0,0 @@ - - Minor bugfixes: - o Downgrade "no current certificates known for authority" message from - Notice to Info. Bugfix on 0.2.0.10-alpha; fixes bug 2899. - diff --git a/changes/bug2917 b/changes/bug2917 deleted file mode 100644 index 6b1e643..0000000 --- a/changes/bug2917 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes - bug 2917. Bugfix on 0.1.1.1-alpha. - diff --git a/changes/bug2933 b/changes/bug2933 deleted file mode 100644 index 7aaf526..0000000 --- a/changes/bug2933 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Fix an uncommon assertion failure when running with DNSPort under - heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. - diff --git a/changes/bug2948 b/changes/bug2948 deleted file mode 100644 index 640ef62..0000000 --- a/changes/bug2948 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes - - Only limit the lengths of single HS descriptors, even when - multiple HS descriptors are published to an HSDir relay in a - single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. - Found by hsdir. - - diff --git a/changes/bug2971 b/changes/bug2971 deleted file mode 100644 index 8b6036e..0000000 --- a/changes/bug2971 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - 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. Fixes bug 2971. - diff --git a/changes/bug2979 b/changes/bug2979 deleted file mode 100644 index fe1f45f..0000000 --- a/changes/bug2979 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - If the Nickname configuration option wasn't given, Tor used to pick - a nickname based on the local hostname as the nickname for a relay. - Because nicknames are not very important in today's Tor and the - "Unnamed" nickname has been implemented, this is now problematic - behaviour: It leaks information about the hostname without being - useful at all. Bugfix on tor-0.1.2.2-alpha, which introduced the - Unnamed nickname. Fixes bug 2979, reported by tagnaq. - diff --git a/changes/exitnodes_reliable b/changes/exitnodes_reliable deleted file mode 100644 index 62ef03a..0000000 --- a/changes/exitnodes_reliable +++ /dev/null @@ -1,7 +0,0 @@ - o Minor features: - - If ExitNodes is set, still pay attention to the Fast/Stable - status of exits when picking exit nodes. (We used to ignore - these flags when ExitNodes was set, on the grounds that people - who set exitnodes wanted all of those nodes to get used, but - with the ability to pick exits by country and IP range, this - doesn't necessarily make sense any more.)

1 0

[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