From 094096d3200e597bff0dcd30a60d6e3ae63d1755 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 17 Nov 2007 12:28:18 +0000 Subject: [PATCH] get rid of the __ConsiderAllRoutersAsHidServDirectories config option svn:r12528 --- src/or/config.c | 2 -- src/or/dirserv.c | 2 -- src/or/or.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index abf919bfe1..62fcf63b39 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 8840871701..8c4a359093 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 8f077234f5..f32fa4ea9f 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? */