diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-13 12:27:36 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-13 12:27:36 -0500 |
| commit | d0b75b5ade6713373e97fdbd563b8ffaf14f237b (patch) | |
| tree | b18a09fa61ca899d47f020e7f1608360ba81adea | |
| parent | 3300a6e93aa9e6adfe9c6bb7949b3774e98b94f8 (diff) | |
| parent | 7df28ce2990cc0890b05767f07756990e0d91e97 (diff) | |
| download | tor-d0b75b5ade6713373e97fdbd563b8ffaf14f237b.tar.gz tor-d0b75b5ade6713373e97fdbd563b8ffaf14f237b.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/bug24262 | 3 | ||||
| -rw-r--r-- | src/or/hs_common.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 0000000000..eee69512e4 --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index f79aeb5981..a0f2af29cd 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -224,7 +224,7 @@ get_time_period_length(void) return sr_state_get_protocol_run_duration() / 60; } - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX); |