[or-cvs] and backport

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	circuitbuild.c 
Log Message:
and backport


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.230.2.1
retrieving revision 1.230.2.2
diff -u -p -d -r1.230.2.1 -r1.230.2.2
--- circuitbuild.c	18 Apr 2006 03:05:34 -0000	1.230.2.1
+++ circuitbuild.c	5 Jun 2006 08:59:28 -0000	1.230.2.2
@@ -2003,6 +2003,8 @@ entry_guard_set_status(const char *diges
             SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e,
               {
                 routerinfo_t *r;
+                if (e == entry)
+                  break;
                 if (e->made_contact) {
                   e->down_since = 0;
                   r = entry_is_live(e, 0, 1);
@@ -2011,8 +2013,6 @@ entry_guard_set_status(const char *diges
                     r->is_running = 1;
                   }
                 }
-                if (e == entry)
-                  break;
               });
             log_info(LD_CIRC,
                      "Connected to new entry guard '%s'. Marking earlier "