Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/or/routerparse.c
	src/or/test.c
This commit is contained in:
Nick Mathewson
2011-01-15 13:25:13 -05:00
5 changed files with 30 additions and 14 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes
- Fix some potential asserts and partsing issues with grossly
malformed router caches. Fixes bug 2352. Found by doorss.
Bugfix on Tor 0.2.1.27.