Merge branch 'maint-0.2.2' into release-0.2.2

ReleaseNotes

@@ -52,12 +52,8 @@ Changes in version 0.2.1.29 - 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:
     - Update to the January 1 2011 Maxmind GeoLite Country database.
@@ -67,6 +63,10 @@ Changes in version 0.2.1.29 - 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.
 
 
 Changes in version 0.2.1.28 - 2010-12-17