Merge branch 'maint-0.2.4'

This commit is contained in:
Roger Dingledine 2013-09-21 02:21:15 -04:00
commit 99703c9b31

View File

@ -2121,9 +2121,8 @@ connection_or_send_netinfo(or_connection_t *conn)
memset(&cell, 0, sizeof(cell_t)); memset(&cell, 0, sizeof(cell_t));
cell.command = CELL_NETINFO; cell.command = CELL_NETINFO;
/* Timestamp, if we're a relay. */ /* Timestamp. */
if (! conn->handshake_state->started_here) set_uint32(cell.payload, htonl((uint32_t)now));
set_uint32(cell.payload, htonl((uint32_t)now));
/* Their address. */ /* Their address. */
out = cell.payload + 4; out = cell.payload + 4;