diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
| commit | 41eef6680e814f453cc8eedff415e941429aa627 (patch) | |
| tree | 7d2ac796e36d7c5786289a6093a98c66c36dbaad /src/or/config.c | |
| parent | c6ea014b5978a020ca4472345216ba29584db5a9 (diff) | |
| parent | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (diff) | |
| download | tor-41eef6680e814f453cc8eedff415e941429aa627.tar tor-41eef6680e814f453cc8eedff415e941429aa627.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
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 dbc355d72..afcea1f4c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -420,7 +420,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 } |