diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 18:10:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 18:10:24 -0400 |
| commit | 1db6eb6cb7db46d8dde482f629fbc1c578310d52 (patch) | |
| tree | b8913134d76ef66246b140b478a5651680873580 /src/or/relay.c | |
| parent | b1b6552251c87db6c4fd226add8ae8bdb9327981 (diff) | |
| parent | 9dfa244484ff9c52d545daa620e034b4d03f969c (diff) | |
| download | tor-1db6eb6cb7db46d8dde482f629fbc1c578310d52.tar.gz tor-1db6eb6cb7db46d8dde482f629fbc1c578310d52.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 7180cfb28a..657ee32fcc 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -53,9 +53,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); +/* XXXX023 move this all to compat_libevent */ /** Cache the current hi-res time; the cache gets reset when libevent * calls us. */ - static struct timeval cached_time_hires = {0, 0}; /** Stop reading on edge connections when we have this many cells @@ -77,7 +77,7 @@ tor_gettimeofday_cached(struct timeval *tv) void tor_gettimeofday_cache_clear(void) { - cached_time_hires.tv_sec = 0; + cached_time_hires.tv_sec = 0; } /** Stats: how many relay cells have originated at this hop, or have |