r16049@catbus: nickm | 2007-10-22 15:31:16 -0400

 fix trunk compile

svn:r12110

diff --git a/doc/TODO b/doc/TODO
index b158b8a305e3c4fd063cc5df8aa881a76b0b0704..b0d6980331545417014e3a82b180ae5894daa97c 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -62,11 +62,6 @@ Things we'd like to do in 0.2.0.x:
 
   - 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 @@ Things we'd like to do in 0.2.0.x:
         - 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

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 44d2d1d8adcfcbd89a0ffe47d849b65383a4f384..2baad3458ceecaf7bc4f9fd3c2db2242da8a6cb4 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -950,7 +950,7 @@ update_v2_networkstatus_cache_downloads(time_t now)
 }
 
 /**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.  */