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

This commit is contained in:
Nick Mathewson
2013-09-21 08:55:45 -04:00
+3 -2
View File
@@ -2121,8 +2121,9 @@ connection_or_send_netinfo(or_connection_t *conn)
memset(&cell, 0, sizeof(cell_t));
cell.command = CELL_NETINFO;
/* Timestamp. */
set_uint32(cell.payload, htonl((uint32_t)now));
/* 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. */
out = cell.payload + 4;