Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	src/or/microdesc.c

Conflict because one change was on line adjacent to line where
01206893 got fixed.
This commit is contained in:
Nick Mathewson
2013-12-17 13:18:00 -05:00
6 changed files with 62 additions and 7 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes:
- Avoid a crash bug when starting with a corrupted microdescriptor
cache file. Fix for bug 10406; bugfix on 0.2.2.6-alpha.