diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:44:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:44:09 -0500 |
| commit | 44010c6fc11608b13924372a179825946672cb23 (patch) | |
| tree | 50df3bb4cacb9823422cd1a9bf61ba26ff5ae577 /src/or/circuitlist.c | |
| parent | bb7c5b431d12808c8cfda0cf9029bc1c0b2d12c6 (diff) | |
| parent | 50124fd7a643deaa9a4072b2e54278226baaf5b0 (diff) | |
| download | tor-44010c6fc11608b13924372a179825946672cb23.tar.gz tor-44010c6fc11608b13924372a179825946672cb23.zip | |
Merge branch 'dgoulet_ticket23709_033_01_squashed'
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index fa19c0afd0..6157bf68b7 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -505,8 +505,7 @@ circuit_count_pending_on_channel(channel_t *chan) circuit_get_all_pending_on_channel(sl, chan); cnt = smartlist_len(sl); smartlist_free(sl); - log_debug(LD_CIRC,"or_conn to %s at %s, %d pending circs", - chan->nickname ? chan->nickname : "NULL", + log_debug(LD_CIRC,"or_conn to %s, %d pending circs", channel_get_canonical_remote_descr(chan), cnt); return cnt; |