checkpoint some changes as i read diffs

svn:r8780

3 files changed, 22 insertions, 16 deletions

diff --git a/doc/TODO b/doc/TODO
index aee472e547..7c257c0aee 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -90,13 +90,6 @@ R     - option to dl directory info via tor
           non-Tor DL when not enough info present.
       D Count TLS bandwidth more accurately
 
-    - Improvements to bandwidth counting
-R     - look into "uncounting" bytes spent on local connections, so
-        we can bandwidthrate but still have fast downloads.
-R     - "bandwidth classes", for incoming vs initiated-here conns.
-d     - Write limiting; separate token bucket for write
-        - Write-limit directory responses (need to research)
-
 N - DNS improvements
     o Option to deal with broken DNS of the "ggoogle.com? Ah, you meant
       ads.me.com!" variety.
@@ -233,6 +226,12 @@ d - need to figure out how to fetch status of a few servers from the BDA
     without fetching all statuses. A new URL to fetch I presume?
 
 Deferred from 0.1.2.x:
+  - Improvements to bandwidth counting
+R   - look into "uncounting" bytes spent on local connections, so
+      we can bandwidthrate but still have fast downloads.
+R   - "bandwidth classes", for incoming vs initiated-here conns.
+d   - Write limiting; separate token bucket for write
+      - Write-limit directory responses (need to research)
   - Directory guards
   - RAM use in directory authorities.
   - Memory use improvements:
@@ -278,6 +277,9 @@ Deferred from 0.1.2.x:
       - Implement
 
 Minor items for 0.1.2.x as time permits:
+  - some way for the authorities to set BadExit for some nodes manually.
+  - "getinfo fingerprint" controller command
+  - "setevent guards" controller command
   - The Debian package now uses --verify-config when (re)starting,
     to distinguish configuration errors from other errors. Perhaps
     the RPM and other startup scripts should too?
@@ -288,14 +290,14 @@ Minor items for 0.1.2.x as time permits:
     the descriptor.
   - Flesh out options_description array in src/or/config.c
   - Don't let 'newnym' be triggered more often than every n seconds.
-  - change log_fn() to log() on notice/warn/err logs where we can.
+  o change log_fn() to log() on notice/warn/err logs where we can.
   - the deb now uses --verify-config to distinguish between configuration
     errors and other errors. Should the rpm, the ports, etc do this too?
   X If we try to publish as a nickname that's already claimed, should
     we append a number (or increment the number) and try again? This
     way people who read their logs can fix it as before, but people
     who don't read their logs will still offer Tor servers.
-    - Fall back to unnamed; warn user; sent controller event.
+    - Fall back to unnamed; warn user; send controller event.
 ! - Tor should bind its ports before dropping privs, so users don't
     have to do the ipchains dance.
   - Rate limit exit connections to a given destination -- this helps
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index abf9de8dfe..49e81995a9 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -352,11 +352,11 @@ $Id$
     "ns/id/<OR identity>" or "desc/name/<OR nickname>" -- the latest network
       status info for a given OR.  Network status info is as given in
       dir-spec.txt, and reflects the current beliefs of this Tor about the
-      router in question. [First implemented in 0.1.2.3-alpha]  Like
-      directory clients, controllers MUST tolerate unrecognized flags and
-      lines.  The published date and descriptor digest are those believed to
-      be best by this Tor, not necessarily those for a descriptor that Tor
-      currently has.
+      router in question. Like directory clients, controllers MUST
+      tolerate unrecognized flags and lines.  The published date and
+      descriptor digest are those believed to be best by this Tor,
+      not necessarily those for a descriptor that Tor currently has.
+      [First implemented in 0.1.2.3-alpha.]
 
     "ns/all" -- Network status info for all ORs we have an opinion about,
       joined by newlines. [First implemented in 0.1.2.3-alpha.]
@@ -1064,7 +1064,9 @@ $Id$
 
      BAD_SERVER_DESCRIPTOR
      "dirauth=nickname"
-     // dir authorities didn't like my descriptor
+     "reason=string"
+     // dir authorities didn't like my descriptor, e.g. because they
+     // think it's malformed, you're invalid, or wrong key.
 
   Actions for STATUS_SERVER severity ERR events can be as follows:
 
diff --git a/doc/dir-spec.txt b/doc/dir-spec.txt
index 3ccba15ab9..2f6264c0d6 100644
--- a/doc/dir-spec.txt
+++ b/doc/dir-spec.txt
@@ -669,6 +669,8 @@ $Id$
    it is recommended by at least one networkstatus AND no "better"
    descriptor has been downloaded.  [Versions of Tor before 0.1.2.3-alpha
    would discard descriptors simply for being published too far in the past.]
+   [The code seems to discard descriptors in all cases after they're 5
+   days old. True? -RD]
 
 5.3. Managing downloads
 
@@ -806,7 +808,7 @@ $Id$
 
 7.1. HTTP headers
 
-  Servers MAY set the Content-Length header.  Servers SHOULD set
+  Servers MAY set the Content-Length: header.  Servers SHOULD set
   Content-Encoding to "deflate" or "identity".
 
   Servers MAY include an X-Your-Address-Is: header, whose value is the