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

Conflicts:
	src/or/routerlist.c

diff --cc src/or/routerlist.c
index 37de70f0b51b5458c31de7a020551cd7bf3aa841,30c20bf6e61e151d29ff648e5f4412a0574f0ae1..4979b933ade100dd55a2acc6e0ace6a125cd4c2c
--- 1/src/or/routerlist.c
--- 2/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;