diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-12-24 11:42:35 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-12-24 11:42:35 -0500 |
commit | 573ee36eae63962f5af162a7f732fe4459513c94 (patch) | |
tree | e91a8b271fd25af89de01bc53b51f88e7673252a /src/or/rephist.c | |
parent | 3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb (diff) | |
parent | 2b8962bc64852d601efa2a8a624bffbbf5ba7ef5 (diff) | |
download | tor-573ee36eae63962f5af162a7f732fe4459513c94.tar.gz tor-573ee36eae63962f5af162a7f732fe4459513c94.zip |
Merge remote-tracking branch 'public/bug10485'
Diffstat (limited to 'src/or/rephist.c')
-rw-r--r-- | src/or/rephist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 13404badf4..dd4ef12efe 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3018,7 +3018,7 @@ rep_hist_log_circuit_handshake_stats(time_t now) { (void)now; /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ - log_notice(LD_HIST, "Circuit handshake stats since last time: " + log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], |