[or-cvs] [tor/release-0.2.2] fold in another set of changes

[arma at torproject.org]

commit 5f63f0d6312d9f0d66b736f872657fd20f10551c
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Jan 15 22:34:09 2011 -0500

    fold in another set of changes
---
 ChangeLog       |   10 ++++++++++
 changes/bug2317 |    9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 055657d..9a1ab68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,16 @@ Changes in version 0.2.2.21-alpha - 2011-01-15
       added a check to Makefile.am to make sure that we're building with
       Automake 1.7 or later.
 
+  o Major bugfixes, new in 0.2.2.21-alpha:
+    - Prevent crash/heap corruption when the cbtnummodes consensus
+      parameter is set to 0 or large values. Fixes bug 2317; bugfix
+      on 0.2.2.14-alpha.
+
+  o Major features, new in 0.2.2.21-alpha:
+    - Introduce minimum/maximum values that clients will believe
+      from the consensus. Now we'll have a better chance to avoid crashes
+      or worse when a consensus param has a weird value.
+
   o Minor features, new in 0.2.2.21-alpha:
     - Make sure to disable DirPort if running as a bridge. DirPorts aren't
       used on bridges, and it makes bridge scanning somewhat easier.
diff --git a/changes/bug2317 b/changes/bug2317
deleted file mode 100644
index 0b9366c..0000000
--- a/changes/bug2317
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Major features:
-    - Introduce minimum/maximum values that a client is going to believe
-      in a consensus. This helps to avoid crashes or worse when a param
-      has a weird value.
-
-  o Major bugfixes:
-    - Prevent crash/heap corruption when cbtnumnodes consensus parameter is
-      set to 0 or large values. Fixes bug 2317.
-