rearrange changelog a bit

svn:r14068

1 files changed, 21 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f8becd3ec..b626cee38f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,42 @@
-Changes in version 0.2.0.22-rc - 2008-03-??
+Changes in version 0.2.0.22-rc - 2008-03-17
   o Major features:
     - Enable encrypted directory connections by default, so censor
       tools that block Tor directory connections based on their plaintext
       patterns will no longer work. This means Tor works in certain
       censored countries by default again.
 
-  o Minor features:
-    - Downgrade "sslv3 alert handshake failure" message to INFO.
+  o Major bugfixes:
+    - Make sure servers always request certificates from clients during
+      TLS renegotiation. Reported by lodger; bugfix on 0.2.0.20-rc.
 
-  o Minor bugfixes:
+  o Minor bugfixes (on 0.1.2.x):
+    - Generate "STATUS_SERVER" events rather than misspelled
+      "STATUS_SEVER" events. Caught by mwenge.
+    - When counting the number of bytes written on a TLS connection,
+      look at the BIO actually used for writing to the network, not
+      at the BIO used (sometimes) to buffer data for the network.
+      Looking at different BIOs could result in write counts on the
+      order of ULONG_MAX. Fixes bug 614.
+
+  o Minor bugfixes (on 0.2.0.x):
+    - Downgrade "sslv3 alert handshake failure" message to INFO.
     - If we set RelayBandwidthRate and RelayBandwidthBurst very high but
       left BandwidthRate and BandwidthBurst at the default, we would be
       silently limited by those defaults. Now raise them to match the
       RelayBandwidth* values.
-    - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER"
-      events.  Caught by mwenge; bugfix on 0.1.2.x.
     - Fix the SVK version detection logic to work correctly on a branch.
-      Bugfix on 0.2.0.x.
-    - Make sure servers always request certificates from clients during
-      TLS renegotiation. Bugfix on 0.2.0.x.
-    - When counting the number of bytes written on a TLS connection, look at
-      the BIO actually used for writing to the network, not at the BIO used
-      (sometimes) to buffer data for the network.  Looking at different BIOs
-      could result in write counts on the order of ULONG_MAX.  Fix for bug
-      614.  Bugfix on 0.1.2.x.
-    - Make --enable-openbsd-malloc work correctly on Linux with alpha CPUs.
-      Fixes bug 625.  Bugfix on 0.2.0.x.
+    - Make --enable-openbsd-malloc work correctly on Linux with alpha
+      CPUs. Fixes bug 625.
     - Logging functions now check that the passed severity is sane.
-    - Use proper log levels in the testsuite call of get_interface_address6().
+    - Use proper log levels in the testsuite call of
+      get_interface_address6().
     - When using a nonstandard malloc, do not use the platform values for
       HAVE_MALLOC_GOOD_SIZE or HAVE_MALLOC_USABLE_SIZE.
-    - Make the openbsd malloc code use 8k pages on alpha CPUs.  Bugfix on
-      0.2.0.x.
+    - Make the openbsd malloc code use 8k pages on alpha CPUs.
     - Detect mismatched page sizes when using --enable-openbsd-malloc.
-      Bugfix on 0.2.0.x.
     - Avoid double-marked-for-close warning when certain kinds of invalid
       .in-addr.arpa addresses are passed to the DNSPort.  Part of a fix
-      for bug 617.  Bugfix on 0.2.0.1-alpha.
+      for bug 617. Bugfix on 0.2.0.1-alpha.
 
 
 Changes in version 0.2.0.21-rc - 2008-03-02