Преглед на файлове

Just because both are obsolete does not mean we prefer the newer

svn:r6016
Peter Palfrader преди 19 години
родител
ревизия
c7f2970777
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2 3
      src/or/connection_or.c

+ 2 - 3
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) ||