Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-04-07 11:43:36 -04:00
commit 09759a66ea

View File

@ -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)