Fix ChangeLog entry for asciidoc branch.

diff --git a/ChangeLog b/ChangeLog
index a30737ea2dc20cb2b247a6abd2745feb151da60b..cd401440c04f91b673e138051da4c1b6a0be052b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes in version 0.2.2.9-alpha - 2010-??-??
+  o Code simplifications and refactoring:
+    - Generate our manpage and HTML documentation using Asciidoc.  This
+      should make it easier to maintain the documentation, and produce
+      nicer HTML.
+
+  o Removed features:
+    - Stop shipping parts of the website in the source tarballs.
+
+
 Changes in version 0.2.2.8-alpha - 2010-01-26
   o Major bugfixes:
     - Fix a memory corruption bug on bridges that occured during the
@@ -158,7 +168,6 @@ Changes in version 0.2.2.7-alpha - 2010-01-19
     - Remove the HSAuthorityRecordStats option that version 0 hidden
       service authorities could have used to track statistics of overall
       hidden service usage.
-    - Stop shipping parts of the website in the tarballs.
 
 
 Changes in version 0.2.1.22 - 2010-01-19