diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-29 19:10:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-29 19:10:47 +0000 |
| commit | 024798ee4c6d504f7aec3ddcb3dfc07d96e475f1 (patch) | |
| tree | 9b41f179d481a3f762c00597cc3993a028f6aeb7 /src/or/config.c | |
| parent | e136f00ca8a955afc7507ba5e5e91374a7b59401 (diff) | |
| download | tor-024798ee4c6d504f7aec3ddcb3dfc07d96e475f1.tar.gz tor-024798ee4c6d504f7aec3ddcb3dfc07d96e475f1.zip | |
r16263@catbus: nickm | 2007-10-29 15:08:17 -0400
Tidy last patch a bit.
svn:r12273
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/or/config.c b/src/or/config.c index acb5dc71e2..d8dcfac16d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -118,8 +118,6 @@ typedef struct config_var_t { /** An entry for config_vars: "The option <b>name</b> is obsolete." */ #define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL } - - /** Array of configuration options. Until we disallow nonstandard * abbreviations, order is significant, since the first matching option will * be chosen first. @@ -287,13 +285,12 @@ static config_var_t _option_vars[] = { VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), - VAR("__ConsiderAllRoutersAsHidServDirectories", BOOL, - __ConsiderAllRoutersAsHidServDirectories, "0"), + /*XXXX020 for testing. Maybe remove before -rc. */ + V(__ConsiderAllRoutersAsHidServDirectories, BOOL, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), VAR("__LeaveStreamsUnattached",BOOL, LeaveStreamsUnattached, "0"), - VAR("__MinUptimeHidServDirectoryV2", INTERVAL, - __MinUptimeHidServDirectoryV2, "24 hours"), - + /*XXXX020 for testing. Maybe remove before -rc. */ + V(__MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; #undef VAR |