diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-18 13:51:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-18 13:51:21 -0500 |
| commit | a3e6f2467b55bdd122ef764a7d23e040c6395fb8 (patch) | |
| tree | 883f2e7eaff3845c2c8f392437f25b4c5cdec73a /src/app | |
| parent | 872998dd003f0935d8eb83d760d5b8bc17904233 (diff) | |
| parent | 06046c726fb09ec745d2a565abfef28097856a19 (diff) | |
| download | tor-a3e6f2467b55bdd122ef764a7d23e040c6395fb8.tar.gz tor-a3e6f2467b55bdd122ef764a7d23e040c6395fb8.zip | |
Merge remote-tracking branch 'tor-github/pr/595'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 1d0b435c7c..f5f5a21893 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; |