Merge remote-tracking branch 'tor-github/pr/595'

changes/ticket28840

@@ -0,0 +1,3 @@
+  o Minor features (testing):
+    - Allow HeartbeatPeriod of less than 30 minutes in testing Tor networks.
+      Closes ticket 28840, patch by robgjansen

src/app/config/config.c

@@ -3897,7 +3897,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
   }
 
   if (options->HeartbeatPeriod &&
-      options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD) {
+      options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD &&
+      !options->TestingTorNetwork) {
     log_warn(LD_CONFIG, "HeartbeatPeriod option is too short; "
              "raising to %d seconds.", MIN_HEARTBEAT_PERIOD);
     options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;