Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased

There was a merge conflict in routerlist.c due to the new node_t logic.

Conflicts:
	src/or/routerlist.c
This commit is contained in:
Nick Mathewson
2011-02-04 12:26:59 -05:00
4 changed files with 21 additions and 3 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes:
- Clients should not weight BadExit nodes as Exits in their node
selection. Similarly, directory authorities should not count
BadExit bandwidth as Exit bandwidth when computing bandwidth-weights.
Bugfix on 0.2.2.10-alpha; fixes bug 2203.