summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-12-17 13:18:00 -0500
committerNick Mathewson <nickm@torproject.org>2013-12-17 13:18:00 -0500
commitadfcc1da4aac9766274275460fe2252bd9ffe4eb (patch)
tree9e4e7227f5f076f322990ee1c2e25fc8491d3eca /changes
parente6590efaa77c8cf186ce92e6ebad175e9c6450d1 (diff)
parent3d5154550c92766347631e4d15fae825a0f165dd (diff)
downloadtor-adfcc1da4aac9766274275460fe2252bd9ffe4eb.tar.gz
tor-adfcc1da4aac9766274275460fe2252bd9ffe4eb.zip
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.
Diffstat (limited to 'changes')
-rw-r--r--changes/bug104093
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug10409 b/changes/bug10409
new file mode 100644
index 0000000000..5ef5ae29de
--- /dev/null
+++ b/changes/bug10409
@@ -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.