diff --git a/changes/bug4349 b/changes/bug4349
new file mode 100644
index 0000000000..633916bdfd
--- /dev/null
+++ b/changes/bug4349
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - When sending a NETINFO cell, include the original address
+      received for the other side, not its canonical address.  Found
+      by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 27a34d3d15..1fffba7733 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   /* Their address. */
   out = cell.payload + 4;
-  len = append_address_to_payload(out, &conn->_base.addr);
+  len = append_address_to_payload(out, &conn->real_addr);
   if (len<0)
     return -1;
   out += len;