[tor-commits] [tor/master] allow any value for HearbeatPeriod in testing Tor networks

[nickm at torproject.org]

commit 325348b360fc8a51d1344d918c1bb20017f1e863
Author: Rob Jansen <jansen at cs.umn.edu>
Date:   Wed Dec 12 15:27:45 2018 -0500

    allow any value for HearbeatPeriod in testing Tor networks
---
 src/app/config/config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index dcefa3d6a..071c33d53 100644
--- 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;