Merge branch 'maint-0.2.2' into release-0.2.2

src/or/circuitbuild.c

@@ -262,7 +262,7 @@ circuit_build_times_test_frequency(void)
 }
 
 /**
- * Retrieve and bounds-check the cbtmintimeout consensus paramter.
+ * Retrieve and bounds-check the cbtmintimeout consensus parameter.
  *
  * Effect: This is the minimum allowed timeout value in milliseconds.
  * The minimum is to prevent rounding to 0 (we only check once

src/or/main.c

@@ -1162,7 +1162,10 @@ run_scheduled_events(time_t now)
    *    it's not comfortable with the number of available circuits.
    */
   /* XXXX022 If our circuit build timeout is much lower than a second, maybe
-     we should do this more often? */
+   * we should do this more often? -NM
+   * It can't be lower than 1.5 seconds currently; see
+   * circuit_build_times_min_timeout(). -RD
+   */
   circuit_expire_building();
 
   /** 3b. Also look at pending streams and prune the ones that 'began'