Merge remote-tracking branch 'origin/maint-0.2.2'

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.

src/or/connection_or.c

@@ -1923,7 +1923,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;