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/command.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/command.c')
| -rw-r--r-- | src/or/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/command.c b/src/or/command.c index e377f4fb67..12b4c30f5c 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -274,8 +274,8 @@ command_process_create_cell(cell_t *cell, or_connection_t *conn) cell->circ_id, (int)(time(NULL) - conn->_base.timestamp_created)); if (router) log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Details: nickname \"%s\", platform %s.", - router->nickname, escaped(router->platform)); + "Details: router %s, platform %s.", + router_describe(router), escaped(router->platform)); return; } |