[or-cvs] [tor/master 2/3] Update some documentation for the bug 1525 fix

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sun, 8 Aug 2010 15:20:24 +0200
Subject: Update some documentation for the bug 1525 fix
Commit: 162c8847de6f0d9f01c5ec1358e7345956990a74

---
 changes/bug1525          |    2 +-
 src/or/connection_edge.c |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug1525 b/changes/bug1525
index 64f5b17..04f2e3b 100644
--- a/changes/bug1525
+++ b/changes/bug1525
@@ -1,4 +1,4 @@
   o Minor bugfixes:
     - Ensure DNS requests launched by "RESOLVE" commands from the controller
-      respect __LeaveStreamsUnattached. Bugfix on 0.2.2.14-alpha;
+      respect __LeaveStreamsUnattached. Bugfix on 0.2.0.1-alpha;
       fixes bug 1525.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 365a797..a0f6e85 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1409,7 +1409,10 @@ consider_plaintext_ports(edge_connection_t *conn, uint16_t port)
 #define TRACKHOSTEXITS_RETRIES 5
 
 /** Call connection_ap_handshake_rewrite_and_attach() unless a controller
- *  asked us to leave streams unattached.
+ *  asked us to leave streams unattached. Return 0 in that case.
+ *
+ *  See connection_ap_handshake_rewrite_and_attach()'s
+ *  documentation for arguments and return value.
  */
 int
 connection_ap_rewrite_and_attach_if_allowed(edge_connection_t *conn,
-- 
1.7.1