diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 12:26:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 12:26:23 -0400 |
commit | 26811a8e2d23cc248dc40095bbd6e0e00af08c1c (patch) | |
tree | 0d337127b542fb35b6832cab75daf89286c85f91 /changes | |
parent | 2579d827ab5e840561fb293f42a7147b8ba78efe (diff) | |
parent | 24a45f54d270d86dde456cbb45640811d1ba26c2 (diff) | |
download | tor-26811a8e2d23cc248dc40095bbd6e0e00af08c1c.tar.gz tor-26811a8e2d23cc248dc40095bbd6e0e00af08c1c.zip |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug1805 | 4 | ||||
-rw-r--r-- | changes/bug1952 | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug1805 b/changes/bug1805 new file mode 100644 index 0000000000..fdd03fb985 --- /dev/null +++ b/changes/bug1805 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make sure we don't warn about not having bandwidth weights when + choosing bridges or other relays not in the consensus. Bugfix + on 0.2.2.10-alpha; fixes bug 1805. diff --git a/changes/bug1952 b/changes/bug1952 new file mode 100644 index 0000000000..e6784aa3d3 --- /dev/null +++ b/changes/bug1952 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Alter how consensus bandwidth-weights are computed using new constraints + that should succeed in all cases. Also alter directory authorities to not + include the bandwidth-weights line if they fail to produce valid values. + Fixes bug 1952; bugfix on 0.2.2.10-alpha. |