aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-09-21 02:11:51 -0400
committerRoger Dingledine <arma@torproject.org>2013-09-21 02:11:51 -0400
commit4f036acd274fe9e16b2b068575aa63e217db1dad (patch)
tree664a491e01aa1d53d64cb9962b4acb048c8f866f /src/or/connection_or.c
parent07bb17185681f875be461c4fea6c661fae2dfde9 (diff)
downloadtor-4f036acd274fe9e16b2b068575aa63e217db1dad.tar
tor-4f036acd274fe9e16b2b068575aa63e217db1dad.tar.gz
back out most of 1d0ba9a
this was causing directory authorities to send a time of 0 on all connections they generated themselves, which means everybody reachability test caused a time skew warning in the log for that relay. (i didn't just revert, because the changes file has been modified by other later commits.)
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 39a5317cf..9bf4e8da5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2051,9 +2051,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;