be willing to expire routers that have a dirport open

it's just the authoritative dirservers we want to not forget

svn:r2173

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 79dabc490233d21ad62a66ce8a57d81e7c6e848c..fa318fccab722eb56b9a5d5849cf21a51940f78d 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -507,8 +507,7 @@ routerlist_remove_old_routers(int age)
   for (i = 0; i < smartlist_len(routerlist->routers); ++i) {
     router = smartlist_get(routerlist->routers, i);
     if (router->published_on <= cutoff &&
-/* XXX008 don't get fooled by cached dir ports */
-      !router->dir_port) {
+      !router->is_trusted_dir) {
       /* Too old.  Remove it. But never remove dirservers! */
       log_fn(LOG_INFO,"Forgetting obsolete routerinfo for node %s.", router->nickname);
       routerinfo_free(router);