declare that we're going to put 0.2.0.33 out this month.

svn:r17895

2 files changed, 10 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 57e341441e..9cd73f6cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.0.33 - 2009-??-??
+Changes in version 0.2.0.33 - 2009-01-??
   o Major bugfixes:
     - When a stream at an exit relay is in state "resolving" or
       "connecting" and it receives an "end" relay cell, the exit relay
@@ -8,7 +8,7 @@ Changes in version 0.2.0.33 - 2009-??-??
       reported by "wood".
     - When sending CREATED cells back for a given circuit, use a 64-bit
       connection ID to find the right connection, rather than an addr:port
-      combination.  Now that we can have multiple OR connections between
+      combination. Now that we can have multiple OR connections between
       the same ORs, it is no longer possible to use addr:port to uniquely
       identify a connection.
 
@@ -47,18 +47,18 @@ Changes in version 0.2.0.33 - 2009-??-??
       the cache because we already had a v0 descriptor with the same ID.
       Bugfix on 0.2.0.18-alpha.
     - Fix a race condition when freeing keys shared between main thread
-      and CPU workers that could result in a memory leak.  Bugfix on
-      0.1.0.1-rc.  Fixes bug 889.
+      and CPU workers that could result in a memory leak. Bugfix on
+      0.1.0.1-rc. Fixes bug 889.
     - Send a valid END cell back when a client tries to connect to a
-      nonexistent hidden service port.  Bugfix on 0.1.2.15.  Fixes bug
-      840.  Patch from rovv.
+      nonexistent hidden service port. Bugfix on 0.1.2.15. Fixes bug
+      840. Patch from rovv.
     - Check which hops rendezvous stream cells are associated with to
       prevent possible guess-the-streamid injection attacks from
-      intermediate hops.  Fixes another case of bug 446. Based on patch
+      intermediate hops. Fixes another case of bug 446. Based on patch
       from rovv.
     - If a broken client asks a non-exit router to connect somewhere,
       do not even do the DNS lookup before rejecting the connection.
-      Fixes another case of bug 619.  Patch from rovv.
+      Fixes another case of bug 619. Patch from rovv.
 
   o Minor bugfixes (hidden services):
     - Do not throw away existing introduction points on SIGHUP. Bugfix on
@@ -243,7 +243,7 @@ Changes in version 0.2.0.29-rc - 2008-07-08
       O_CREAT flag. Fortify was complaining, and correctly so. Fixes
       bug 742; fix from Michael Scherer. Bugfix on 0.0.2pre19.
     - Correctly detect transparent proxy support on Linux hosts that
-      require in.h to be included before netfilter_ipv4.h.  Patch
+      require in.h to be included before netfilter_ipv4.h. Patch
       from coderman.
 
 
diff --git a/doc/TODO.020 b/doc/TODO.020
index 30bdefc9e4..99a901e920 100644
--- a/doc/TODO.020
+++ b/doc/TODO.020
@@ -3,36 +3,17 @@
 description of the patch.)
 
 Backport for 0.2.0:
-  o r17135: ClientDNSRejectInternalAddresses not consistently obeyed.
 
 Backport for 0.2.0 once better tested:
-  o r16136: prevent circid collision.  [Also backport to 0.1.2.x??]
-  o r16558: Avoid mis-routing CREATED cells.
   Xo r16621: Make some DNS code more robust (partial; see also libevent
             approach). (Also maybe r16674)
     [Partially backported.  Instead of the basic name checking, I backported
      r17171 instead, to be even more resistant to poisoning.]
-  o r17091: distinguish "no routers support pending circuits" from
-            "no circuits are pending."
-    o See also r17181...
-    o ... and r17184.
-  o r17137: send END cell in response to connect to nonexistent hidserv port.
-  o r17138: reject *:* servers should never do DNS lookups.
-  o r17139: Fix another case of overriding .exit choices.
-  o r17162 and r17164: fix another case of not checking cpath_layer.
   - r17208,r17209,r7211,r17212,r17214: Avoid gotterdammerung when an
     authority has an expired certificate.
-  o r17562: Fix bug 874, wherein a sighup would make us kill all our intro
-    points and leave their corpses for the next set of intro points to
-    stumble over.
-  o r17566: FIx bug 691, wherein failure to run dns_init() would kill Tor
-    dead.
   - r17886:  Don't remove routerinfos as unlisted unless we have a
     consensus.
   - r17887:  Don't accept 1.2.3 as a valid IP address.
 
-
 Backport for 0.2.0, maybe:
-  o r14830: Disable TLS compression.  This saves RAM and CPU, and
-    makes our TLS compression harder to distinguish from
-    firefox's. Win/win/win, right?
+