get rid of the __ConsiderAllRoutersAsHidServDirectories config option

svn:r12528

diff --git a/src/or/config.c b/src/or/config.c
index abf919bfe1fd70ace297e5581d2ce684ddeda1c8..62fcf63b39b04df199679f32627d45a92dbdae66 100644 (file)
--- 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 8840871701b74ccf6e120340ca7b61af5f26a07e..8c4a359093d5709048d410b8121454452fc01d8b 100644 (file)
--- 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 8f077234f5ec4f9fbe564dad92047d03a86db452..f32fa4ea9fb4e172039f9a2d30e67a8fae0e4240 100644 (file)
--- 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? */