Merge branch 'maint-0.2.8'

1 files changed, 9 insertions, 3 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 9f3306dc4f..4de2e70a1d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2004,18 +2004,24 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options)
   return PORT_FORWARDING_CHECK_INTERVAL;
 }
 
+/** Callback to write heartbeat message in the logs. */
 static int
 heartbeat_callback(time_t now, const or_options_t *options)
 {
   static int first = 1;
-  /* 12. write the heartbeat message */
+
+  /* Check if heartbeat is disabled */
+  if (!options->HeartbeatPeriod) {
+    return PERIODIC_EVENT_NO_UPDATE;
+  }
+
+  /* Write the heartbeat message */
   if (first) {
     first = 0; /* Skip the first one. */
   } else {
     log_heartbeat(now);
   }
-  /* XXXX This isn't such a good way to handle possible changes in the
-   * callback event */
+
   return options->HeartbeatPeriod;
 }