diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 11:43:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 11:43:36 -0400 |
| commit | 09759a66eae044e640f477ebe96b1c3edbb98c94 (patch) | |
| tree | 136a6b5f727bf0b0e1de3eca9b15c3290a0063ac | |
| parent | 53d02a63dfee248669c402d3480af7184758cf52 (diff) | |
| parent | 286d44402e829488abe802efd1607eabbc98f1d1 (diff) | |
| download | tor-09759a66eae044e640f477ebe96b1c3edbb98c94.tar.gz tor-09759a66eae044e640f477ebe96b1c3edbb98c94.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index faad49c4e5..5488eb7bed 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -292,7 +292,7 @@ circuit_expire_building(void) long ms = tor_lround(msec); \ struct timeval diff; \ diff.tv_sec = ms / 1000; \ - diff.tv_usec = (ms % 1000) * 1000; \ + diff.tv_usec = (int)((ms % 1000) * 1000); \ timersub(&now, &diff, &target); \ } while (0) |