[or-cvs] [tor/master] put karsten's changelog in the right place

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Wed, 26 Aug 2009 20:20:09 -0400
Subject: put karsten's changelog in the right place
Commit: 15462f72eb6c442c33d5d6be27da0802c01e6f5e

---
 ChangeLog |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0182faa..733e222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,8 @@ Changes in version 0.2.2.1-alpha - 2009-08-26
     - If the cached cert file is unparseable, warn but don't exit.
     - Fix possible segmentation fault on directory authorities. Bugfix on
       0.2.1.14-rc.
+    - When Tor fails to parse a descriptor of any kind, dump it to disk.
+      Might help diagnosing bug 1051.
 
   o Deprecated and removed features:
     - The controller no longer accepts the old obsolete "addr-mappings/"
@@ -103,8 +105,6 @@ Changes in version 0.2.1.20 - 2009-??-??
     - Fix a signed/unsigned compile warning in 0.2.1.19.
     - Fix possible segmentation fault on directory authorities. Bugfix on
       0.2.1.14-rc.
-    - When Tor fails to parse a descriptor of any kind, dump it to disk.
-      Might help diagnosing bug 1051.
 
 
 Changes in version 0.2.1.19 - 2009-07-28
-- 
1.5.6.5