Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	src/or/dirserv.c

diff --cc src/or/dirserv.c
index be6db64e2c24552a4a12defbe53661b6da03e6bc,e4533b77359f1401c045e34998c0a02c0437da2e..acb8c5cd91a9d5c047c56b5f19f9b28bce73c950
--- 1/src/or/dirserv.c
--- 2/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -1911,8 -1907,7 +1907,7 @@@ router_counts_toward_thresholds(const n
   * the Weighted Fractional Uptime history, and use them to set thresholds for
   * the Stable, Fast, and Guard flags.  Update the fields stable_uptime,
   * stable_mtbf, enough_mtbf_info, guard_wfu, guard_tk, fast_bandwidth,
-  * guard_bandwidth_including_exits, guard_bandwidth_excluding_exits,
-  * total_bandwidth, and total_exit_bandwidth.
 - * guard_bandwidh_including_exits, guard_bandwidth_excluding_exits,
++ * guard_bandwidth_including_exits, and guard_bandwidth_excluding_exits.
   *
   * Also, set the is_exit flag of each router appropriately. */
  static void

diff --cc src/or/or.h
Simple merge

diff --cc src/or/routerlist.c
Simple merge