backport r15571 and give it a changelog entry

svn:r15578

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e6b698c950..a414a4d170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@ Changes in version 0.2.0.29 - 2008-06-xx
       so it asked for another one soon after, until there were no
       more preemptive circuits, at which point it launched one from
       scratch. Bugfix on 0.0.9.x.
+    - Make directory servers include the X-Your-Address-Is: http header in
+      their responses even for begin_dir conns. Now clients who only
+      ever use begin_dir connections still have a way to learn their IP
+      address. Fixes bug 737; bugfix on 0.2.0.22-rc. Reported by goldy.
 
   o Minor bugfixes:
     - Fix a macro/CPP interactions that was confusing some compilers:
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a9b930b42f..161a70d0ae 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2712,9 +2712,9 @@ connection_exit_connect_dir(edge_connection_t *exitconn)
 
   dirconn = TO_DIR_CONN(connection_new(CONN_TYPE_DIR, AF_INET));
 
-  dirconn->_base.addr = 0x7f000001;
+  dirconn->_base.addr = exitconn->_base.addr;
   dirconn->_base.port = 0;
-  dirconn->_base.address = tor_strdup("Tor network");
+  dirconn->_base.address = tor_strdup(circ->p_conn->_base.address);
   dirconn->_base.type = CONN_TYPE_DIR;
   dirconn->_base.purpose = DIR_PURPOSE_SERVER;
   dirconn->_base.state = DIR_CONN_STATE_SERVER_COMMAND_WAIT;