Merge remote-tracking branch 'arma/feature6758'

2 files changed, 7 insertions, 1 deletions

diff --git a/changes/feature6758 b/changes/feature6758
new file mode 100644
index 0000000000..049f05ea12
--- /dev/null
+++ b/changes/feature6758
@@ -0,0 +1,5 @@
+  o Minor features:
+    - Omit the first heartbeat log message, because it never has anything
+      useful to say, and it clutters up the bootstrapping messages.
+      Resolves ticket 6758.
+
diff --git a/src/or/main.c b/src/or/main.c
index f3b781ec2f..f3624f6cfb 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1562,7 +1562,8 @@ run_scheduled_events(time_t now)
   /** 12. write the heartbeat message */
   if (options->HeartbeatPeriod &&
       time_to_next_heartbeat <= now) {
-    log_heartbeat(now);
+    if (time_to_next_heartbeat) /* don't log the first heartbeat */
+      log_heartbeat(now);
     time_to_next_heartbeat = now+options->HeartbeatPeriod;
   }
 }