Merge branch 'bug2321' into maint-0.2.2

This commit is contained in:
Nick Mathewson 2011-01-26 11:06:55 -05:00
commit 1478aa99b7

View File

@ -660,9 +660,9 @@ circuit_build_times_update_state(circuit_build_times_t *cbt,
static void static void
circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt, circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt,
build_time_t *raw_times, build_time_t *raw_times,
int num_times) uint32_t num_times)
{ {
int n = num_times; uint32_t n = num_times;
if (num_times > CBT_NCIRCUITS_TO_OBSERVE) { if (num_times > CBT_NCIRCUITS_TO_OBSERVE) {
log_notice(LD_CIRC, "The number of circuit times that this Tor version " log_notice(LD_CIRC, "The number of circuit times that this Tor version "
"uses to calculate build times is less than the number stored " "uses to calculate build times is less than the number stored "