[or-cvs] [tor/maint-0.2.1] Move and fix a changelog entry. Noticed by optimist.

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Sun, 7 Jun 2009 00:03:27 -0400
Subject: Move and fix a changelog entry.  Noticed by optimist.
Commit: 8a02f61ad622976cd9a13233e672f6def700047b

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

diff --git a/ChangeLog b/ChangeLog
index 29d1c0e..842f0c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@ Changes in version 0.2.1.16-?? - 2009-??-??
     - Fix a race condition that could cause crashes or memory
       corruption when running as a server with a controller listening
       for log messages.
+    - Avoid crashing when we have a policy specified in a DirPolicy or
+      SocksPolicy or ReachableAddresses option with ports set on it, and we
+      re-load the policy.  May fix bug 996.
 
   o Minor bugfixes (on 0.2.1.x):
     - When switching back and forth between bridge mode, do not start
@@ -88,9 +91,6 @@ Changes in version 0.2.1.14-rc - 2009-04-12
       patch by Sebastian.
     - Avoid crashing in the presence of certain malformed descriptors.
       Found by lark, and by automated fuzzing.
-    - Avoid crashing when we have "private" in a policy specified in
-      a DirPolicy or SocksPolicy or ReachableAddresses option and we
-      re-load the policy.  May fix bug 996.
 
   o Minor features:
     - When generating circuit events with verbose nicknames for
-- 
1.5.6.5