[or-cvs] [tor/master] move nickm's commit to the correct release

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 12 Oct 2009 15:01:10 -0400
Subject: move nickm's commit to the correct release
Commit: 27db67898503121a6223c73392dbcbb69edca4cd

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

diff --git a/ChangeLog b/ChangeLog
index 87548e8..72f4aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.2.6-alpha - 2009-10-??
+  o Code simplifications and refactorings:
+    - Numerous changes, bugfixes, and workarounds from Nathan Freitas
+      to help Tor build correctly for Android phones.
+
+
 Changes in version 0.2.2.5-alpha - 2009-10-11
   o Major bugfixes:
     - Make the tarball compile again. Oops. Bugfix on 0.2.2.4-alpha.
@@ -5,10 +11,6 @@ Changes in version 0.2.2.5-alpha - 2009-10-11
   o New directory authorities:
     - Move dizum to an alternate IP address.
 
-  o Code simplifications and refactorings
-    - Numerous changes, bugfixes, and workarounds from Nathan Freitas 
-      to help Tor build correctly for Android phones.
-
 
 Changes in version 0.2.2.4-alpha - 2009-10-10
   o Major bugfixes:
-- 
1.5.6.5