When we're checking if we have enough dir info for each relay

to begin establishing circuits, make sure that we actually have
the descriptor listed in the consensus, not just any descriptor.


svn:r15119

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 60d649213e..bc8fbd2de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,11 +4,14 @@ Changes in version 0.2.0.28-rc - 2008-06-??
       put in our relay end cell that we send to the exit relay, Tor
       clients on Windows were sometimes sending the wrong 'reason'. The
       anonymity problem is that exit relays may be able to guess whether
-      client is running Windows, thus helping partition the anonymity
+      the client is running Windows, thus helping partition the anonymity
       set. Down the road we should stop sending reasons to exit relays,
       or otherwise prevent future versions of this bug.
 
   o Minor fixes:
+    - When we're checking if we have enough dir info for each relay
+      to begin establishing circuits, make sure that we actually have
+      the descriptor listed in the consensus, not just any descriptor.
     - Bridge relays no longer print "xx=0" in their extrainfo document
       for every single country code in the geoip db.
     - Only warn when we fail to load the geoip file if we were planning to
diff --git a/doc/TODO.020 b/doc/TODO.020
index 8c216be9ea..ed16731599 100644
--- a/doc/TODO.020
+++ b/doc/TODO.020
@@ -4,7 +4,7 @@ description of the patch.)
 
 Items before a stable 0.2.0.x bundle:
   - Tor items:
-R   - backport r14970
+    X backport r14970
 R   - releasenotes
   - Vidalia items:
 E   d address arma's Linux 100% cpu bug
@@ -21,6 +21,6 @@ Backport items for 0.2.0:
 
 Backport for 0.2.0 once better tested:
   - r14830: disable openssl compression.
-  - r14971: we don't have enough dir info if we have mostly wrong
+  o r14971: we don't have enough dir info if we have mostly wrong
     descriptors
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 538d8e942f..83d36d351c 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4162,7 +4162,7 @@ update_router_have_minimum_dir_info(void)
      {
        if (client_would_use_router(rs, now, options)) {
          ++num_usable;
-         if (router_get_by_digest(rs->identity_digest)) {
+         if (router_get_by_descriptor_digest(rs->descriptor_digest)) {
            ++num_present;
          }
        }