[or-cvs] [tor/release-0.2.2] fix 0.2.2 changelog to match 0.2.1

[arma at torproject.org]

commit d082e2888db13dfc53b0340cffa2375a0879f56b
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 18 19:14:14 2011 -0500

    fix 0.2.2 changelog to match 0.2.1
---
 ChangeLog |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a1ab68..2bf2f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,12 +48,8 @@ Changes in version 0.2.2.21-alpha - 2011-01-15
     - Correctly handle the case where AutomapHostsOnResolve is set but
       no virtual addresses are available. Fixes bug 2328; bugfix on
       0.1.2.1-alpha. Bug found by doorss.
-    - Correctly handle wrapping around to when we run out of virtual
-      address space. Found by cypherpunks, bugfix on 0.2.0.5-alpha.
-    - The 0.2.1.28 tarball was missing src/common/OpenBSD_malloc_Linux.c
-      because we built it with a too-old version of automake. Thus that
-      release broke ./configure --enable-openbsd-malloc, which is popular
-      among really fast exit relays on Linux.
+    - Correctly handle wrapping around when we run out of virtual
+      address space. Found by cypherpunks; bugfix on 0.2.0.5-alpha.
 
   o Minor features, also included in 0.2.1.29:
     - Update to the January 1 2011 Maxmind GeoLite Country database.
@@ -63,6 +59,10 @@ Changes in version 0.2.2.21-alpha - 2011-01-15
     - Tor does not build packages correctly with Automake 1.6 and earlier;
       added a check to Makefile.am to make sure that we're building with
       Automake 1.7 or later.
+    - The 0.2.1.28 tarball was missing src/common/OpenBSD_malloc_Linux.c
+      because we built it with a too-old version of automake. Thus that
+      release broke ./configure --enable-openbsd-malloc, which is popular
+      among really fast exit relays on Linux.
 
   o Major bugfixes, new in 0.2.2.21-alpha:
     - Prevent crash/heap corruption when the cbtnummodes consensus