diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-06 13:27:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-06 13:27:04 -0500 |
| commit | 1b93e3c6d9802d64db7ce752717cf02ed35d1b60 (patch) | |
| tree | 8854ce58c05cb1faf4820ab6ac9ad97815fce0b1 /src/or/rephist.c | |
| parent | 34740a17ea8145f7d308991b710e759b90a0d87b (diff) | |
| parent | 655adbf6677fde28ba37f029701083901eda7efd (diff) | |
| download | tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.tar.gz tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
changes/bug10485
src/or/rephist.c
src/or/status.c
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index dd4ef12efe..66dc5f611f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3017,7 +3017,6 @@ void 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_HEARTBEAT, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], |