summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-15 13:25:13 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-15 13:25:13 -0500
commit1393985768d760e11e45faabb537d28248306e8b (patch)
tree61b35b3b734f8a920a08cc9a9ecb70e408cd4a58 /changes
parent9d133464c874191414dd51f546d09364419040cf (diff)
parentb97b0efec81c5564999c2545dd7f0ca230b239cc (diff)
downloadtor-1393985768d760e11e45faabb537d28248306e8b.tar.gz
tor-1393985768d760e11e45faabb537d28248306e8b.zip
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts: src/or/routerparse.c src/or/test.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug23526
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug2352 b/changes/bug2352
new file mode 100644
index 0000000000..744dbdb20f
--- /dev/null
+++ b/changes/bug2352
@@ -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.
+
+