[or-cvs] stop being so picky about when we can start building circui...

[arma@xxxxxxxx]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	routerlist.c 
Log Message:
stop being so picky about when we can start building circuits.
now clients are more likely to have circuits up soon after their
tor starts.


Index: routerlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -d -r1.494 -r1.495
--- routerlist.c	10 Apr 2006 01:35:56 -0000	1.494
+++ routerlist.c	10 Apr 2006 05:44:54 -0000	1.495
@@ -3574,7 +3574,6 @@ router_have_minimum_dir_info(void)
 {
   int tot = 0, num_running = 0;
   int n_ns, n_tried, n_authorities, res, avg;
-  static int have_ever_tried_all = 0;
   static int have_enough = 0;
   if (!networkstatus_list || !routerlist) {
     res = 0;
@@ -3589,18 +3588,6 @@ router_have_minimum_dir_info(void)
     res = 0;
     goto done;
   }
-  if (!have_ever_tried_all) {
-    n_tried=n_ns;
-    SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds,
-                      if (ds->n_networkstatus_failures) ++n_tried);
-    if (n_tried < n_authorities) {
-      log_info(LD_DIR,
-               "We have only tried downloading %d/%d network statuses.",
-               n_tried, n_authorities);
-    } else {
-      have_ever_tried_all = 1;
-    }
-  }
   SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
                     tot += routerstatus_count_usable_entries(ns->entries));
   avg = tot / n_ns;