diff --git a/ChangeLog b/ChangeLog
index 5bc24fb2f..078ba2ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,18 +8,16 @@ Changes in version 0.1.2.18 - 2007-??-??
       --list-fingerprint or --verify-config or --hash-password. (Resolves
       bug 499.)
     - When generating information telling us how to extend to a given
-      router, do not try to include the nickname if it is absent. (Resolves
-      bug 467.)
-    - Fix a user-triggerable segfault in expand_filename().  (There isn't
+      router, do not try to include the nickname if it is
+      absent. (Resolves bug 467.)
+    - Fix a user-triggerable segfault in expand_filename(). (There isn't
       a way to trigger this remotely.)
+    - When sending a status event to the controller telling it that an
+      OR address is readable, set the port correctly. (Previously we
+      were reporting the dir port.)
     - Fix a minor memory leak whenever a controller sends the PROTOCOLINFO
       command. Bugfix on 0.1.2.17.
 
-  o Minor bugfixes (controller):
-    - When sending a status event to the controller telling it that an
-      OR address is readable, set the port correctly.  (Previously we
-      were reporting the dir port.)
-
 
 Changes in version 0.1.2.17 - 2007-08-30
   o Major bugfixes (security):
diff --git a/doc/TODO.012 b/doc/TODO.012
index 00b573d2a..d61f65119 100644
--- a/doc/TODO.012
+++ b/doc/TODO.012
@@ -2,16 +2,7 @@
 description of the patch.)
 
 Backport items for 0.1.2:
-  o r10939: Choose with complete fairness when exits are weighted.
-  o r10956: fix the math for exit bandwidth weighting
-  o r10994: Disable SENTINELS checking in order to use less RAM in
-    buffer allocation.
-  o r11117: cookie auth more usable
-  o disable v0 control protocol
-  o r11138: PROTOCOLINFO support.
-  D r11141: CookieAuthFile and CookieAuthFileGroupReadable.
 N - r11166: Don't believe future dates from the state file.
-  o r11566: make r11438 not actually break things.
 N - r11828+: Detect bad sa_family from accept().
 N - r11882: Avoid crash-bug 451.
 N - r11886: Consider family as well as identity when cannibalizing circuits.
@@ -19,19 +10,10 @@ N - r11886: Consider family as well as identity when cannibalizing circuits.
 
 Backport for 0.1.2.x once better tested:
 P - r10579: new addsysuser implementation for osx (??)
-  X coderman's constrained socket buffers patch (r10843)
-    (this is a non-critical new feature. if people want it badly they
-    should run the dev branch.)
-  o r10964: control.c grammar conformance. could conceivably break
-    old controllers that were relying on non-conformance.
-  X some subset of r11229 (unexpected whitespace in malformed descriptors)?
-    (no need, I don't think any of the 0.1.2.x code calls the buggy parts)
   D r11287: Reject address mappings to internal addresses. (??)
     (this will break some existing test-network configurations, yes?)
 R - r11499, r11500, r11501: hidserv hexdigests rather than nicknames
 P - r11548, the osx /tmp fix
-  o r11293: Bulletproof code to generate extend info.
-  o r11332: Fix user-triggerable segfault in expand_filename("~")
 N - r11829: Don't warn when cancel_pending_resolve() finds a cached failure.
 R - r11915: just because you hup, don't publish a near-duplicate descriptor
 
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index b4f1d0049..c5fbfae88 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -94,7 +94,6 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn,
     } else {
       if (conn->socks_request->command == SOCKS_COMMAND_CONNECT_DIR) {
         /* don't use three-hop circuits -- that could hurt our anonymity. */
-        log_debug(LD_CIRC,"Skipping multi-hop circuit for CONNECT_DIR.");
         return 0;
       }
     }