Merge branch 'bug2321' into maint-0.2.2

diff --cc src/or/circuitbuild.c
index b49b7e08d2ec8419802a38b0aa18954a4c98245c,5c9c1acf2515d81b63482f74046246d20669a33a..4f8f5fbab0d51e2e387b807f4b1431f2fd958c9e
--- 1/src/or/circuitbuild.c
--- 2/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 */