diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch) | |
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc /src/or/config.c | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff) | |
| download | tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz | |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 7202ea254..897250647 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -401,7 +401,8 @@ static config_var_t _option_vars[] = { VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword, NULL), VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), - V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"), + V(MinUptimeHidServDirectoryV2, INTERVAL, "25 hours"), + V(VoteOnHidServDirectoriesV2, BOOL, "1"), V(_UsingTestNetworkDefaults, BOOL, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } |