aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-11-18 11:20:35 -0500
committerNick Mathewson <nickm@torproject.org>2013-11-18 11:20:35 -0500
commitbd25bda7c0dd5d3c28a03d2555212d6beb338e23 (patch)
tree7763b5843ad06aacb94d29bc8612d3da15733dab /src/or/relay.c
parent4b9ec85e4703eb3542e6a397f1f6c02c62c1f589 (diff)
downloadtor-bd25bda7c0dd5d3c28a03d2555212d6beb338e23.tar
tor-bd25bda7c0dd5d3c28a03d2555212d6beb338e23.tar.gz
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.
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 0c9267a9a..b5e4ff7cc 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)