diff --git a/ChangeLog b/ChangeLog
index 02f444f69..2f8becd3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@ Changes in version 0.2.0.22-rc - 2008-03-??
       0.2.0.x.
     - Detect mismatched page sizes when using --enable-openbsd-malloc.
       Bugfix on 0.2.0.x.
+    - Avoid double-marked-for-close warning when certain kinds of invalid
+      .in-addr.arpa addresses are passed to the DNSPort.  Part of a fix
+      for bug 617.  Bugfix on 0.2.0.1-alpha.
 
 
 Changes in version 0.2.0.21-rc - 2008-03-02
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 2cb8e5e80..27dc4d05f 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2012,7 +2012,10 @@ connection_ap_handshake_send_resolve(edge_connection_t *ap_conn)
       ap_conn->socks_request->address[len-13] = '\0';
     }
     if (tor_inet_aton(ap_conn->socks_request->address, &in) == 0) {
-      connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL);
+      /* Do not mark here; every caller of
+       * connection_ap_attach_{chosen_}circuit() [which calls this function
+       * will also mark on a -1 return value. */
+      // connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL);
       return -1;
     }
     if (c) {