sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-11-13 12:26:46 -05:00
parent 5355b99dc0 7df28ce299
commit d96f7f38e8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug24262 Normal file
View File

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

2
src/or/hs_common.c
View File

@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path,
STATIC uint64_t
get_time_period_length(void)
{
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);