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 | |
| parent | 34740a17ea8145f7d308991b710e759b90a0d87b (diff) | |
| parent | 655adbf6677fde28ba37f029701083901eda7efd (diff) | |
| download | tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.tar tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
changes/bug10485
src/or/rephist.c
src/or/status.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/rephist.c | 1 | ||||
| -rw-r--r-- | src/or/status.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index dd4ef12ef..66dc5f611 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], diff --git a/src/or/status.c b/src/or/status.c index 415f4daea..e1820c888 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -16,6 +16,7 @@ #include "main.h" #include "rephist.h" #include "hibernate.h" +#include "rephist.h" #include "statefile.h" static void log_accounting(const time_t now, const or_options_t *options); @@ -129,8 +130,6 @@ log_heartbeat(time_t now) log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead); } - /* Also commandeer this opportunity to log how our circuit handshake - * stats have been doing. */ if (public_server_mode(options)) rep_hist_log_circuit_handshake_stats(now); |