mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

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

Browse Source
This commit is contained in:
Nick Mathewson 2018-12-18 13:51:21 -05:00
commit a3e6f2467b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket28840 Normal file
View File

@ -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

3
src/app/config/config.c
View File

@ -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;