diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-12-17 13:18:00 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-12-17 13:18:00 -0500 |
commit | adfcc1da4aac9766274275460fe2252bd9ffe4eb (patch) | |
tree | 9e4e7227f5f076f322990ee1c2e25fc8491d3eca /changes | |
parent | e6590efaa77c8cf186ce92e6ebad175e9c6450d1 (diff) | |
parent | 3d5154550c92766347631e4d15fae825a0f165dd (diff) | |
download | tor-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/bug10409 | 3 |
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. |