diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 12:52:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 12:52:43 -0400 |
| commit | df98582851a92d514c04061a5e0ec762c17a0cfb (patch) | |
| tree | b52518169d65be6773a5abb606f3f56b5b8c9d25 /src/or/connection_or.c | |
| parent | fe8f7748202816a9b90e04db542e449145283a66 (diff) | |
| parent | 02a4442524d84ea7edf6e3f136017faa73452d92 (diff) | |
| download | tor-df98582851a92d514c04061a5e0ec762c17a0cfb.tar.gz tor-df98582851a92d514c04061a5e0ec762c17a0cfb.zip | |
Merge remote-tracking branch 'github/ticket26626'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index b3021edf16..71ab905942 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -855,9 +855,9 @@ connection_or_set_canonical(or_connection_t *or_conn, TLS_CHAN_TO_BASE(or_conn->chan), is_canonical); log_info(LD_CIRC, - "Channel " U64_FORMAT " chose an idle timeout of %d.", + "Channel %"PRIu64 " chose an idle timeout of %d.", or_conn->chan ? - U64_PRINTF_ARG(TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier):0, + (TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier):0, or_conn->idle_timeout); } |