diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-17 12:28:18 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-17 12:28:18 +0000 |
| commit | 094096d3200e597bff0dcd30a60d6e3ae63d1755 (patch) | |
| tree | ba2f28dd568e1f9d5ecd1007e9462b5cd2dc5cb0 /src | |
| parent | d62ef13d0ad720a55591e6b8e77d4c6b2aa7abe5 (diff) | |
| download | tor-094096d3200e597bff0dcd30a60d6e3ae63d1755.tar tor-094096d3200e597bff0dcd30a60d6e3ae63d1755.tar.gz | |
get rid of the __ConsiderAllRoutersAsHidServDirectories config option
svn:r12528
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index abf919bfe..62fcf63b3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -288,8 +288,6 @@ static config_var_t _option_vars[] = { VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), - /*XXXX020 for testing. Maybe remove before -rc. */ - V(__ConsiderAllRoutersAsHidServDirectories, BOOL, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), VAR("__LeaveStreamsUnattached",BOOL, LeaveStreamsUnattached, "0"), /*XXXX020 for testing. Maybe remove before -rc. */ diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 884087170..8c4a35909 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1909,8 +1909,6 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, } rs->is_bad_exit = listbadexits && ri->is_bad_exit; ri->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, now); - if (get_options()->__ConsiderAllRoutersAsHidServDirectories) - ri->is_hs_dir = 1; /* Override real value. */ rs->is_hs_dir = ri->is_hs_dir; /* 0.1.1.9-alpha is the first version to support fetch by descriptor * hash. */ diff --git a/src/or/or.h b/src/or/or.h index 8f077234f..f32fa4ea9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2092,8 +2092,6 @@ typedef struct { * them at some point, since I think C says that identifiers beginning with * __ are implementation-reserved or something. */ int __MinUptimeHidServDirectoryV2; /**< Accept hs dirs after what time? */ - int __ConsiderAllRoutersAsHidServDirectories; /**< Consider all routers as - * hidden service dirs? */ int FetchUselessDescriptors; /**< Do we fetch non-running descriptors too? */ int AllDirActionsPrivate; /**< Should every directory action be sent * through a Tor circuit? */ |