Merge remote branch 'origin/maint-0.2.1'

Conflicts:
	ChangeLog
	src/or/routerparse.c

1 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c8369fc382..6a324e9728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,21 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
       open() without checking it.
 
 
+Changes in version 0.2.1.25 - 2010-??-??
+  o Major bugfixes:
+    - When freeing a cipher, zero it out completely. We only zeroed
+      the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered
+      and patched by ekir. Fixes bug 1254.
+  o Minor bugfixes:
+    - Fix a dereference-then-NULL-check sequence when publishing
+      descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,
+      fixes bug 1255.
+    - Fix another dereference-then-NULL-check sequence. Bugfix on
+      0.2.1.14-rc. Discovered by ekir, fixes bug 1256.
+    - Make sure we treat potentially not NUL-terminated strings correctly.
+      Bugfix on 0.1.1.13-alpha. Discovered by rieo, fixes bug 1257.
+
+
 Changes in version 0.2.1.24 - 2010-02-21
   Tor 0.2.1.24 makes Tor work again on the latest OS X -- this time
   for sure!