diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-12-15 13:23:27 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-12-15 13:23:27 -0500 |
| commit | 296381eda0efd1c849834b49547a8bb7fe773e71 (patch) | |
| tree | 6f8095196d9b0214622ab2ab8bab5891b141d5aa | |
| parent | 1292a9ddfeef5d9560f4493d6767a10b181f031e (diff) | |
| parent | 27b7746c519125cac703f38a8b325d3a1c08619b (diff) | |
| download | tor-296381eda0efd1c849834b49547a8bb7fe773e71.tar.gz tor-296381eda0efd1c849834b49547a8bb7fe773e71.zip | |
Merge commit 'sebastian/ewma2' into ewma
Conflicts:
src/or/relay.c
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 4a27df6efe..1be09e1df0 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1828,7 +1828,7 @@ static unsigned cell_ewma_tick_from_timeval(const struct timeval *now, double *remainder_out) { - unsigned res = now->tv_sec / EWMA_TICK_LEN; + unsigned res = (unsigned) (now->tv_sec / EWMA_TICK_LEN); /* rem */ double rem = (now->tv_sec % EWMA_TICK_LEN) + ((double)(now->tv_usec)) / 1.0e6; |