Commit c4031ee8 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents 99703c9b d1dbaf24

src/or/connection_or.c

+3 −2
Original line number Diff line number Diff line
@@ -2121,7 +2121,8 @@ connection_or_send_netinfo(or_connection_t *conn) 
  memset(&cell, 0, sizeof(cell_t));

  cell.command = CELL_NETINFO;



  /* Timestamp. */

  /* Timestamp, if we're a relay. */

  if (public_server_mode(get_options()) || ! conn->is_outgoing)

    set_uint32(cell.payload, htonl((uint32_t)now));



  /* Their address. */