From 325348b360fc8a51d1344d918c1bb20017f1e863 Mon Sep 17 00:00:00 2001 From: Rob Jansen Date: Wed, 12 Dec 2018 15:27:45 -0500 Subject: [PATCH 1/2] 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 dcefa3d6a4..071c33d530 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; From 06046c726fb09ec745d2a565abfef28097856a19 Mon Sep 17 00:00:00 2001 From: Matt Traudt Date: Fri, 14 Dec 2018 09:24:19 -0500 Subject: [PATCH 2/2] Add changes file for <30min HeartbeatPeriod patch --- changes/ticket28840 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changes/ticket28840 diff --git a/changes/ticket28840 b/changes/ticket28840 new file mode 100644 index 0000000000..05d3fbb94c --- /dev/null +++ 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