[or-cvs] r10234: backport r10187 (tor/branches/tor-0_1_2-patches/src/or)

[arma at seul.org]

Author: arma
Date: 2007-05-21 08:35:33 -0400 (Mon, 21 May 2007)
New Revision: 10234

Modified:
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
backport r10187


Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-05-21 12:14:45 UTC (rev 10233)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-05-21 12:35:33 UTC (rev 10234)
@@ -2517,9 +2517,6 @@
     return 0;
   }
 
-  if (source != NS_FROM_CACHE && trusted_dir)
-    trusted_dir->n_networkstatus_failures = 0;
-
   found = 0;
   for (i=0; i < smartlist_len(networkstatus_list); ++i) {
     networkstatus_t *old_ns = smartlist_get(networkstatus_list, i);
@@ -2567,6 +2564,9 @@
     }
   }
 
+  if (source != NS_FROM_CACHE && trusted_dir)
+    trusted_dir->n_networkstatus_failures = 0;
+
   if (!found)
     smartlist_add(networkstatus_list, ns);