Merge remote-tracking branch 'public/bug10485'

1 files changed, 6 insertions, 0 deletions

diff --git a/src/or/status.c b/src/or/status.c
index 6e2206e5e..415f4daea 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);