From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Nov 2013 16:20:35 +0000 (-0500)
Subject: Remove 'struct timeval now' that was shadowing 'struct timeval now'.
X-Git-Tag: tor-0.2.5.2-alpha~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd25bda7c0dd5d3c28a03d2555212d6beb338e23;p=thirdparty%2Ftor.git

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

diff --git a/src/or/relay.c b/src/or/relay.c
index 0c9267a9a5..b5e4ff7cc4 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)