Merge remote-tracking branch 'public/bug10485'

3 files changed, 7 insertions, 6 deletions

diff --git a/src/or/main.c b/src/or/main.c
index e14001f102..dd4214ef0b 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1373,11 +1373,6 @@ run_scheduled_events(time_t now)
         next_time_to_write_stats_files = next_write;
     }
     time_to_write_stats_files = next_time_to_write_stats_files;
-
-    /* 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);
   }
 
   /* 1h. Check whether we should write bridge statistics to disk.
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],
diff --git a/src/or/status.c b/src/or/status.c
index 6e2206e5e5..415f4daea8 100644
--- a/src/or/status.c
+++ b/src/or/status.c
@@ -14,6 +14,7 @@
 #include "router.h"
 #include "circuitlist.h"
 #include "main.h"
+#include "rephist.h"
 #include "hibernate.h"
 #include "statefile.h"
 
@@ -128,6 +129,11 @@ 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);
+
   tor_free(uptime);
   tor_free(bw_sent);
   tor_free(bw_rcvd);