aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-26 11:06:55 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-26 11:06:55 -0500
commit1478aa99b7f113ccb800dc9a94e3501968aa59c6 (patch)
tree4073012a960847e1b1096bd2ad2c071947080036 /src/or/circuitbuild.c
parent9e7691b05c77261290b10ef433bf377f02a98705 (diff)
parent9a4b2ec764de7ff49931a4ea561febada728d9b3 (diff)
downloadtor-1478aa99b7f113ccb800dc9a94e3501968aa59c6.tar
tor-1478aa99b7f113ccb800dc9a94e3501968aa59c6.tar.gz
Merge branch 'bug2321' into maint-0.2.2
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b49b7e08d..4f8f5fbab 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -660,9 +660,9 @@ circuit_build_times_update_state(circuit_build_times_t *cbt,
static void
circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt,
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) {
log_notice(LD_CIRC, "The number of circuit times that this Tor version "
"uses to calculate build times is less than the number stored "