[tor-commits] [tor/master] Remove 'struct timeval now' that was shadowing 'struct timeval now'.

[nickm@xxxxxxxxxxxxxx]

commit bd25bda7c0dd5d3c28a03d2555212d6beb338e23
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 18 11:20:35 2013 -0500

    Remove 'struct timeval now' that was shadowing 'struct timeval now'.
    
    This was a mistake in the merge commit 7a2b30fe16eacc040b3dd11. It
    would have made the CellStatistics code give completely bogus
    results. Bug not in any released Tor.
---
 src/or/relay.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 0c9267a..b5e4ff7 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2222,7 +2222,6 @@ cell_queue_append_packed_copy(circuit_t *circ, cell_queue_t *queue,
   /*XXXX This may be obsoleted by inserted_time */
   if ((get_options()->CellStatistics ||
       get_options()->TestingEnableCellStatsEvent) && use_stats) {
-    struct timeval now;
     uint32_t added;
     insertion_time_queue_t *it_queue = queue->insertion_times;
     if (!it_pool)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits