harmonize with 0.9.7 tree

diff --git a/CHANGES b/CHANGES
index 21c005c406bb98f424b2ec3c3351e8a9b183e2e9..09509abd4bfc31d664d65025daf5544f610ae0b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -338,10 +338,6 @@ TODO: bug: pad  x  with leading zeros if necessary
   *) Avoid filename truncation in cert requests.
      [Ben Laurie (CHATS)]
 
-  *) New OPENSSL_assert() macro (similar to assert(), but enabled
-     unconditionally).
-     [Ben Laurie (CHATS)]
-
   *) Add assertions to check for (supposedly impossible) buffer
      overflows.
      [Ben Laurie (CHATS)]
@@ -373,6 +369,10 @@ TODO: bug: pad  x  with leading zeros if necessary
      overflowing internal buffers by having large block sizes, etc.
      [Ben Laurie (CHATS)]
 
+  *) New OPENSSL_assert() macro (similar to assert(), but enabled
+     unconditionally).
+     [Ben Laurie (CHATS)]
+
   *) Eliminate unused copy of key in RC4.
      [Ben Laurie (CHATS)]