Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	changes/bug10485
	src/or/rephist.c
	src/or/status.c

3 files changed, 9 insertions, 3 deletions

diff --git a/changes/bug10485 b/changes/bug10485
index aa599fba72..d2b3d8be0b 100644
--- a/changes/bug10485
+++ b/changes/bug10485
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
   o Minor bugfixes:
     - Turn "circuit handshake stats since last time" log messages into a
       heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc.
 
+||||||| merged common ancestors
+=======
+  o Minor bugfixes:
+    - Move message about circuit handshake counts into the heartbeat
+      message where it belongs, instead of logging it once per hour
+      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
+>>>>>>> origin/maint-0.2.4
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],
diff --git a/src/or/status.c b/src/or/status.c
index 415f4daea8..e1820c8889 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);