From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Jan 2011 16:06:55 +0000 (-0500)
Subject: Merge branch 'bug2321' into maint-0.2.2
X-Git-Tag: tor-0.2.2.23-alpha~11^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1478aa99b7f113ccb800dc9a94e3501968aa59c6;p=thirdparty%2Ftor.git

Merge branch 'bug2321' into maint-0.2.2
---

1478aa99b7f113ccb800dc9a94e3501968aa59c6
diff --cc src/or/circuitbuild.c
index b49b7e08d2,5c9c1acf25..4f8f5fbab0
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -660,14 -588,12 +660,14 @@@ circuit_build_times_update_state(circui
  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, "Decreasing circuit_build_times size from %d to %d",
 -               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 "
 +               "in your state file. Decreasing the circuit time history from "
 +               "%d to %d.", num_times, CBT_NCIRCUITS_TO_OBSERVE);
    }
  
    /* This code can only be run on a compact array */