r16550@catbus: nickm | 2007-11-07 16:50:02 -0500

 "And $499 for knowing where to hit it."  Fix bug 546.

svn:r12425

diff --git a/ChangeLog b/ChangeLog
index ba015b955b87e5591ef33cc56c78f7599b60e6f8..aa4bc3fc8d101cd93e619b288e2050f8aafff8d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,8 @@ Changes in version 0.2.0.10-alpha - 2007-11-07
     - Avoid sending a request for "keys/fp" (for which we'll get a 400 Bad
       Request) if we need more v3 certs but we've already got pending
       requests for all of them.
+    - Correctly back off from failing certificate downloads.  Fixes bug
+      546.
 
   o New requirements:
     - Drop support for OpenSSL version 0.9.6. Just about nobody was using

diff --git a/doc/TODO b/doc/TODO
index 694279afb08fe6b77f317130bdc8df289002501d..547a70a2df3cda1f355378955f74a02ad15f6ead 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -23,6 +23,9 @@ Items blocking 0.2.0.10-alpha:
     in 0.2.1.x.
   - Should we ship with a fallback-consensus? Where in the tarball does
     it go? What's the process for choosing it?
+    - We can, but we don't have to now.  Stick it in place of the
+      empty fallback-consensus file in src/config if you like.
+    - To choose, just grab the most recent consensus you have.
   - If 1.5*MaxCircuitDirtiness is more than KeepAlive, do we then send
     a KeepAlive and reset our timeout, thus never reaching 1.5*MCD?
   - "When reporting clock skew, and we only have a lower bound on

diff --git a/src/or/directory.c b/src/or/directory.c
index b2b15cc4bbc1d697323855f671077b94eaecdcd4..f836ded7a806bad4ddfb36b35fad834c0676dc47 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -595,7 +595,7 @@ connection_dir_download_cert_failed(dir_connection_t *conn, int status)
   if (!conn->requested_resource)
     return;
   failed = smartlist_create();
-  dir_split_resource_into_fingerprints(conn->requested_resource,
+  dir_split_resource_into_fingerprints(conn->requested_resource+3,
                                        failed, NULL, 1, 0);
   SMARTLIST_FOREACH(failed, char *, cp,
   {