[or-cvs] r12110: fix trunk compile (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-22 15:31:50 -0400 (Mon, 22 Oct 2007)
New Revision: 12110

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/networkstatus.c
Log:
 r16049 at catbus:  nickm | 2007-10-22 15:31:16 -0400
 fix trunk compile



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

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-10-22 18:21:22 UTC (rev 12109)
+++ tor/trunk/doc/TODO	2007-10-22 19:31:50 UTC (rev 12110)
@@ -62,11 +62,6 @@
 
   - Proposals:
     . 101: Voting on the Tor Directory System (plus 103)
-      o Finalize proposal
-        o Describe schedule in copious detail.
-      . Get authorities voting
-        X While we're at it, let v3 authorities have fqdns lines.
-        . Fix all XXXX020s in vote code
       . Validate information properly.
         - Dump certificates with the wrong time.  Or just warn?
         - When checking a consensus, make sure that its times are plausible.
@@ -78,15 +73,6 @@
         - Code to retry consensus download if we got one we already have.
         - Use if-modified-since on consensus download
         - Use if-modified-since on certificate download
-        o Enable for non-caches
-      . Code to use v3 networkstatus documents once clients are
-        fetching them
-        o Implement.
-        o Fix all XXXX020s.
-        o Sort out need_to_mirror
-        o Work hard to make sure clients never look at v2 networkstatus docs.
-        o Check in old_routers before fetching a router status. You never
-          know if we'll flap...
       - Controller support
         - GETINFO to get consensus
         - Event when new consensus arrives

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-22 18:21:22 UTC (rev 12109)
+++ tor/trunk/src/or/networkstatus.c	2007-10-22 19:31:50 UTC (rev 12110)
@@ -950,7 +950,7 @@
 }
 
 /**DOCDOC*/
-#define CONSENUS_NETWORKSTATUS_MAX_DL_TRIES 8
+#define CONSENSUS_NETWORKSTATUS_MAX_DL_TRIES 8
 
 /** If we want to download a fresh consensus, launch a new download as
  * appropriate.  */