diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-14 21:57:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-14 21:57:56 -0400 |
| commit | d34d0b4dc523ae35ab9f9fdc79a54c2601161996 (patch) | |
| tree | 6bc0cbb2b526b8b8e0e463842db2e9c9fad7956f /src/or/routerlist.c | |
| parent | 95ccb1e812ef1a1c38bd3275b2bbf6b95e0c490d (diff) | |
| parent | a6545d6335cd7829cdc9c0d7ce2e61b775bcca1d (diff) | |
| download | tor-d34d0b4dc523ae35ab9f9fdc79a54c2601161996.tar tor-d34d0b4dc523ae35ab9f9fdc79a54c2601161996.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 97427101f..66ebdbe59 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1770,7 +1770,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, "old router selection algorithm."); return -1; } - this_bw = kb_to_bytes(node->rs->bandwidth); + this_bw = kb_to_bytes(node->rs->bandwidth_kb); } else if (node->ri) { /* bridge or other descriptor not in our consensus */ this_bw = bridge_get_advertised_bandwidth_bounded(node->ri); @@ -1921,7 +1921,7 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl, is_guard = node->is_possible_guard; if (node->rs) { if (node->rs->has_bandwidth) { - this_bw = kb_to_bytes(node->rs->bandwidth); + this_bw = kb_to_bytes(node->rs->bandwidth_kb); } else { /* guess */ is_known = 0; } |