diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-21 08:55:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-21 08:55:45 -0400 |
| commit | c4031ee847ab834445d809ace0efc09b9fd46c7c (patch) | |
| tree | 58d01e9378616557bd7a4804d9a77fd86ef23d42 | |
| parent | 99703c9b31375933eede574e1718582743e67d38 (diff) | |
| parent | d1dbaf247396fd18d758f8b7e06935830e38bf4a (diff) | |
| download | tor-c4031ee847ab834445d809ace0efc09b9fd46c7c.tar.gz tor-c4031ee847ab834445d809ace0efc09b9fd46c7c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 99863d1d9e..de43787a85 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -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; |