diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-07 20:36:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-07 20:36:04 -0500 |
| commit | 059c441d27309d411ed520be293dbf189ab599f4 (patch) | |
| tree | 900378df74810de3ab585f1f8c2e268296a30eab | |
| parent | 6d6cd2060f375cbd96b448c0bed67169c309cd65 (diff) | |
| parent | 3dc61a5d71423e86d4d8090a90782a1ddf164880 (diff) | |
| download | tor-059c441d27309d411ed520be293dbf189ab599f4.tar.gz tor-059c441d27309d411ed520be293dbf189ab599f4.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | changes/bug23318 | 7 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/changes/bug23318 b/changes/bug23318 deleted file mode 100644 index 32c85eb194..0000000000 --- a/changes/bug23318 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (path selection): - - When selecting relays by bandwidth, avoid a rounding error that - could sometimes cause load to be imbalanced incorrectly. Previously, - we would always round upwards; now, we round towards the nearest - integer. This had the biggest effect when a relay's weight adjustments - should have given it weight 0, but it got weight 1 instead. - Fixes bug 23318; bugfix on 0.2.4.3-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f0bd343f45..c7c1092539 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2706,7 +2706,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, final_weight = weight*this_bw; } - bandwidths[node_sl_idx] = final_weight; + bandwidths[node_sl_idx] = final_weight + 0.5; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based " |