diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-02-14 17:48:51 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-02-14 17:48:51 +0000 |
| commit | c7f29707775e02463eb3c4af9b19419383f90df0 (patch) | |
| tree | 82001befd09d2d75ce937fa3b95cdb975a5d2917 | |
| parent | 0bab094d5d50608a21e69e23c554c2e858f51461 (diff) | |
| download | tor-c7f29707775e02463eb3c4af9b19419383f90df0.tar.gz tor-c7f29707775e02463eb3c4af9b19419383f90df0.zip | |
Just because both are obsolete does not mean we prefer the newer
svn:r6016
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files 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) || |