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

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)