[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit d34d0b4dc523ae35ab9f9fdc79a54c2601161996
Merge: 95ccb1e a6545d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 14 21:57:56 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Conflicts:
    	src/or/dirserv.c

 src/or/dirserv.c     |  186 ++++++++++++++++++++++++--------------------------
 src/or/dirserv.h     |    4 +-
 src/or/dirvote.c     |   42 ++++++------
 src/or/dirvote.h     |    2 +-
 src/or/or.h          |    6 +-
 src/or/routerlist.c  |    4 +-
 src/or/routerparse.c |   35 +++++-----
 src/test/test_dir.c  |  104 ++++++++++++++--------------
 8 files changed, 190 insertions(+), 193 deletions(-)

diff --cc src/or/dirserv.c
index be6db64,e4533b7..acb8c5c
--- a/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