tor

commit a3e6f2467b55bdd122ef764a7d23e040c6395fb8
parent 872998dd003f0935d8eb83d760d5b8bc17904233
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 18 Dec 2018 13:51:21 -0500

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

Diffstat:
A
changes/ticket28840
 | 
3
+++
M
src/app/config/config.c
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket28840 b/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
diff --git a/src/app/config/config.c b/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;