[or-cvs] r12425: "And $499 for knowing where to hit it." Fix bug 546. (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-11-07 16:51:21 -0500 (Wed, 07 Nov 2007)
New Revision: 12425

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/TODO
   tor/trunk/src/or/directory.c
Log:
 r16550 at catbus:  nickm | 2007-11-07 16:50:02 -0500
 "And $499 for knowing where to hit it."  Fix bug 546.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16550] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-07 21:26:59 UTC (rev 12424)
+++ tor/trunk/ChangeLog	2007-11-07 21:51:21 UTC (rev 12425)
@@ -40,6 +40,8 @@
     - 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

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-11-07 21:26:59 UTC (rev 12424)
+++ tor/trunk/doc/TODO	2007-11-07 21:51:21 UTC (rev 12425)
@@ -23,6 +23,9 @@
     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

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-11-07 21:26:59 UTC (rev 12424)
+++ tor/trunk/src/or/directory.c	2007-11-07 21:51:21 UTC (rev 12425)
@@ -595,7 +595,7 @@
   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,
   {