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/circuituse.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/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 97ac5600a2..138fff6f78 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1324,8 +1324,8 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT; return 0; } - log_info(LD_REND,"Chose '%s' as intro point for '%s'.", - extend_info->nickname, + log_info(LD_REND,"Chose %s as intro point for '%s'.", + extend_info_describe(extend_info), safe_str_client(conn->rend_data->onion_address)); } |