[tor-commits] [tor/maint-0.2.4] back out most of 1d0ba9a

[arma at torproject.org]

commit 4f036acd274fe9e16b2b068575aa63e217db1dad
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 21 02:11:51 2013 -0400

    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.)
---
 src/or/connection_or.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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