Commit 99703c9b authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.4'

parents 6178aaea 4f036acd

src/or/connection_or.c

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

  cell.command = CELL_NETINFO;



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

  if (! conn->handshake_state->started_here)

  /* Timestamp. */

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



  /* Their address. */