mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge commit 'sebastian/ewma2' into ewma
Conflicts: src/or/relay.c
This commit is contained in:
+1
-1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user