Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/router.c
This commit is contained in:
Nick Mathewson
2010-11-19 16:58:22 -05:00
8 changed files with 138 additions and 130 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes:
- Try harder not to exceed the maximum length of 50 KB when writing
statistics to extra-info descriptors. This bug was triggered by very
fast relays reporting exit-port, entry, and dirreq statistics.
Reported by Olaf Selke. Bugfix on 0.2.2.1-alpha. Fixes bug 2183.
+7
View File
@@ -0,0 +1,7 @@
o Minor bugfixes
- Publish a router descriptor even if generating an extra-info
descriptor fails. Previously we would not publish a router
descriptor without an extra-info descriptor; this can cause fast
exit relays collecting exit-port statistics to drop from the
consensus. Bugfix on 0.1.2.9-rc; fixes bug 2195.