From c7f29707775e02463eb3c4af9b19419383f90df0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 14 Feb 2006 17:48:51 +0000 Subject: [PATCH] Just because both are obsolete does not mean we prefer the newer svn:r6016 --- src/or/connection_or.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 54eb78bd6d..c70c573e68 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -398,9 +398,8 @@ connection_or_get_by_identity_digest(const char *digest) 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) ||