[or-cvs] Just because both are obsolete does not mean we prefer the ...

[Peter Palfrader]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv26746

Modified Files:
	connection_or.c 
Log Message:
Just because both are obsolete does not mean we prefer the newer

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -d -r1.212 -r1.213
--- connection_or.c	14 Feb 2006 00:08:19 -0000	1.212
+++ connection_or.c	14 Feb 2006 17:48:51 -0000	1.213
@@ -398,9 +398,8 @@ connection_or_get_by_identity_digest(con
     if (!best->is_obsolete && conn->is_obsolete)
       continue; /* We never prefer obsolete over non-obsolete connections. */
 
-      /* If both are obsolete we prefer the newer: */
-    if ((best->is_obsolete && conn->is_obsolete && newer) ||
-      /* We prefer non-obsolete connections */
+    if (
+      /* We prefer non-obsolete connections: */
         (best->is_obsolete && !conn->is_obsolete) ||
       /* If both have circuits we prefer the newer: */
         (best->n_circuits && conn->n_circuits && newer) ||