diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-30 14:55:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-30 14:55:50 -0400 |
| commit | ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a (patch) | |
| tree | c791e7b6b48b44fa2df56727cd9c80261a892615 /src/or/circuitlist.c | |
| parent | 18126f92a74e9e1d81f9abf02bda2f5458c32bc6 (diff) | |
| parent | 65eb0e41ac05fd65bf8bef87426886fec45f7ca4 (diff) | |
| download | tor-ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a.tar.gz tor-ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.h
src/or/circuitlist.c
src/or/circuituse.c
src/or/or.h
src/or/rephist.c
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d5c74ee7b6..a0359dbdce 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -606,10 +606,10 @@ circuit_dump_details(int severity, circuit_t *circ, int conn_array_index, const char *type, int this_circid, int other_circid) { log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), " - "state %d (%s), born %d:", + "state %d (%s), born %ld:", conn_array_index, type, this_circid, other_circid, circ->state, circuit_state_to_string(circ->state), - (int)circ->timestamp_created.tv_sec); + (long)circ->timestamp_created.tv_sec); if (CIRCUIT_IS_ORIGIN(circ)) { /* circ starts at this node */ circuit_log_path(severity, LD_CIRC, TO_ORIGIN_CIRCUIT(circ)); } |