From: Nick Mathewson Date: Mon, 15 Apr 2013 01:57:56 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.4' X-Git-Tag: tor-0.2.5.1-alpha~211 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d34d0b4dc523ae35ab9f9fdc79a54c2601161996;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/or/dirserv.c --- d34d0b4dc523ae35ab9f9fdc79a54c2601161996 diff --cc src/or/dirserv.c index be6db64e2c,e4533b7735..acb8c5cd91 --- 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