summaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-01-15 22:39:15 -0500
committerRoger Dingledine <arma@torproject.org>2011-01-15 22:39:15 -0500
commit4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23 (patch)
tree77b0407257fb8cd4cb94719df396969095d69e88 /src/or/routerlist.c
parent8e9b25e6c7a2e70c370881ab5748651b1c7de66f (diff)
parent7699014e1e9e183d1fd840e59909bcf77ba3321b (diff)
downloadtor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.tar.gz
tor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 96cc01b960..380e34b99c 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1656,8 +1656,7 @@ smartlist_choose_node_by_bandwidth_weights(smartlist_t *sl,
return NULL;
}
- weight_scale = networkstatus_get_param(NULL, "bwweightscale",
- BW_WEIGHT_SCALE);
+ weight_scale = circuit_build_times_get_bw_scale(NULL);
if (rule == WEIGHT_FOR_GUARD) {
Wg = networkstatus_get_bw_weight(NULL, "Wgg", -1);