diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:18:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:18:59 -0400 |
| commit | 7e67a240381c76b8d18dab862256b73c72d2711f (patch) | |
| tree | ed5442c3da86cc761d7d624c3c2873f70d6467e6 /src/or/routerparse.c | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| parent | 3c0d944b076aa552216ca598a6cdc50e77ad1a58 (diff) | |
| download | tor-7e67a240381c76b8d18dab862256b73c72d2711f.tar.gz tor-7e67a240381c76b8d18dab862256b73c72d2711f.zip | |
Merge branch 'bug3045' into maint-0.2.2
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ce98a47b67..1dcbc6a184 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1210,7 +1210,8 @@ router_parse_list_from_string(const char **s, const char *eos, prepend_annotations); if (router) { log_debug(LD_DIR, "Read router '%s', purpose '%s'", - router->nickname, router_purpose_to_string(router->purpose)); + router_describe(router), + router_purpose_to_string(router->purpose)); signed_desc = &router->cache_info; elt = router; } @@ -2493,7 +2494,7 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } } else { log_warn(LD_BUG, "Missing consensus bandwidth for router %s", - rs->nickname); + routerstatus_describe(rs)); } } SMARTLIST_FOREACH_END(rs); |