From: Roger Dingledine <arma@torproject.org>
Date: Sat, 21 Sep 2013 06:11:51 +0000 (-0400)
Subject: back out most of 1d0ba9a
X-Git-Tag: tor-0.2.5.1-alpha~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f036acd274fe9e16b2b068575aa63e217db1dad;p=thirdparty%2Ftor.git

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.)
---

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 39a5317cfd..9bf4e8da5b 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;