Commit 3ef40f69 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents 4af82fb3 5bea660f

changes/bug4349

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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

+1 −1
Original line number Diff line number Diff line
@@ -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;