diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-29 15:25:04 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-29 15:25:04 +0000 |
| commit | aaf35cccf7ac60c17dac687127ec82c612232836 (patch) | |
| tree | c382f9c21bb2812178fe1eb85147432c65e73b0c /src/or/config.c | |
| parent | 0f22c584cdc797e20f4aef74e5312ebda76d05fa (diff) | |
| download | tor-aaf35cccf7ac60c17dac687127ec82c612232836.tar.gz tor-aaf35cccf7ac60c17dac687127ec82c612232836.zip | |
karsten's second refactoring patch
svn:r12607
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index a0cafb6a98..f7ac9ef6f3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -290,8 +290,7 @@ static config_var_t _option_vars[] = { VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), VAR("__LeaveStreamsUnattached",BOOL, LeaveStreamsUnattached, "0"), - /*XXXX020 for testing. Maybe remove before -rc. */ - V(__MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"), + V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; #undef VAR @@ -2831,10 +2830,10 @@ options_validate(or_options_t *old_options, or_options_t *options, return -1; } - if (options->__MinUptimeHidServDirectoryV2 < 0) { - log_warn(LD_CONFIG, "__MinUptimeHidServDirectoryV2 option must be at " + if (options->MinUptimeHidServDirectoryV2 < 0) { + log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at " "least 0 seconds. Changing to 0."); - options->__MinUptimeHidServDirectoryV2 = 0; + options->MinUptimeHidServDirectoryV2 = 0; } if (options->RendPostPeriod < MIN_REND_POST_PERIOD) { |