diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-09-21 02:21:15 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-09-21 02:21:15 -0400 |
| commit | 99703c9b31375933eede574e1718582743e67d38 (patch) | |
| tree | dca938f859bf275941335dfad5c3c885b862f7c5 | |
| parent | 6178aaea0698d7f62754c2aa1574ad7fd4fa781d (diff) | |
| parent | 4f036acd274fe9e16b2b068575aa63e217db1dad (diff) | |
| download | tor-99703c9b31375933eede574e1718582743e67d38.tar.gz tor-99703c9b31375933eede574e1718582743e67d38.zip | |
Merge branch 'maint-0.2.4'
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 637ee4dd35..99863d1d9e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2121,9 +2121,8 @@ 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) - set_uint32(cell.payload, htonl((uint32_t)now)); + /* Timestamp. */ + set_uint32(cell.payload, htonl((uint32_t)now)); /* Their address. */ out = cell.payload + 4; |