diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
| commit | fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3 (patch) | |
| tree | b80ab67323274c8ae1e2f8097278e923c5d5d243 /src/or/rephist.c | |
| parent | 21de9d46e264ceb14f3fe59d17210d82f2499637 (diff) | |
| parent | 7f0fb8e6083128ff20b30d8cd29c220e9427d95e (diff) | |
| download | tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.tar.gz tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
The conflicts were mainly caused by the routerinfo->node transition.
Conflicts:
src/or/circuitbuild.c
src/or/command.c
src/or/connection_edge.c
src/or/directory.c
src/or/dirserv.c
src/or/relay.c
src/or/rendservice.c
src/or/routerlist.c
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 1ab4171a5f..8f359c717c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -635,6 +635,7 @@ rep_hist_dump_stats(time_t now, int severity) digestmap_iter_t *orhist_it; const char *name1, *name2, *digest1, *digest2; char hexdigest1[HEX_DIGEST_LEN+1]; + char hexdigest2[HEX_DIGEST_LEN+1]; or_history_t *or_history; link_history_t *link_history; void *or_history_p, *link_history_p; @@ -695,7 +696,10 @@ rep_hist_dump_stats(time_t now, int severity) link_history = (link_history_t*) link_history_p; - ret = tor_snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2, + base16_encode(hexdigest2, sizeof(hexdigest2), digest2, DIGEST_LEN); + ret = tor_snprintf(buffer+len, 2048-len, "%s [%s](%ld/%ld); ", + name2, + hexdigest2, link_history->n_extend_ok, link_history->n_extend_ok+link_history->n_extend_fail); if (ret<0) |