Having two "Major features:" sections seems too much of a good thing.

svn:r16962

diff --git a/ChangeLog b/ChangeLog
index 3487e699be5eb7c99c828a52c420e1d633e1e964..8a8f9e2457e574e96339bdfcdbe0ee6463bc18ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       on the type of authentication) to learn introduction points.  This
       feature raises the bar for certain kinds of active attacks against
       hidden services.
+    - Relays now store and serve v2 hidden service descriptors by default
+      (i.e. new default value for HidServDirectoryV2 is 1). This is the
+      last step in proposal 114, which aims to make hidden service
+      connections more reliable.
 
   o Major bugfixes:
     - Fix a bug when parsing ports in tor_addr_port_parse() that caused
@@ -31,12 +35,6 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       these names should be in the questions section, not necessarily
       in the answers section. Fixes bug 823. Bugfix on 0.2.1.5-alpha.
 
-  o Major features:
-    - Relays now store and serve v2 hidden service descriptors by default
-      (i.e. new default value for HidServDirectoryV2 is 1). This is the
-      last step in proposal 114, which aims to make hidden service
-      connections more reliable.
-
   o Minor bugfixes:
     - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.
       Reported by Tas.