commit 93be3a8822ae791cc8adb78ea7d7e76e4c10db41 Merge: 82c5e38 d48cebc Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 12:04:11 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Conflicts: src/or/routerlist.c

changes/pathsel-BUGGY-a | 14 ++++++++++++++ src/or/routerlist.c | 24 +++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-)

diff --cc src/or/routerlist.c index 37de70f,30c20bf..4979b93 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1905,11 -1879,15 +1912,13 @@@ smartlist_choose_node_by_bandwidth_weig * guard node: consider all guard's bandwidth equally. Otherwise, weight * guards proportionally less. */ -static void * -smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule, - int statuses) +static const node_t * +smartlist_choose_node_by_bandwidth(smartlist_t *sl, + bandwidth_weight_rule_t rule) { - unsigned i; + unsigned int i; + unsigned int i_chosen; + unsigned int i_has_been_chosen; - routerinfo_t *router; - routerstatus_t *status=NULL; int32_t *bandwidths; int is_exit; int is_guard;