don't ever expire dirserver routerinfos!

svn:r1908

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a91a3b8cf640118927f4e633403e48b373eb7f20..5dca80370f8c16e8018629a3abe52dcb05fbc1a6 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -366,8 +366,9 @@ routerlist_remove_old_routers(void)
   cutoff = time(NULL) - ROUTER_MAX_AGE;
   for (i = 0; i < smartlist_len(routerlist->routers); ++i) {
     router = smartlist_get(routerlist->routers, i);
-    if (router->published_on < cutoff) {
-      /* Too old.  Remove it. */
+    if (router->published_on < cutoff &&
+      !router->dir_port) {
+      /* Too old.  Remove it. But never remove dirservers! */
       log_fn(LOG_INFO,"Forgetting obsolete routerinfo for node %s.", router->nickname);
       routerinfo_free(router);
       smartlist_del(routerlist->routers, i--);