[tor-commits] [tor/release-0.2.2] fold in one more

[arma at torproject.org]

commit 52789c863e78bcb3d3c9072efe7ffc188337cb1c
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Nov 27 03:35:15 2011 -0500

    fold in one more
---
 ChangeLog       |    3 +++
 changes/bug4230 |    5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2096215..229cc7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@ Changes in version 0.2.2.35 - 2011-11-??
     - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers
       function. This was eating up hideously large amounts of time on some
       busy servers. Fixes bug 4518; bugfix on 0.0.9.8.
+    - Resolve an integer overflow bug in smartlist_ensure_capacity.
+      Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by
+      Mansour Moufid.
     - Don't warn about unused log_mutex in log.c when building with
       --disable-threads using a recent GCC. Fixes bug 4437; bugfix on
       0.1.0.6-rc which introduced --disable-threads.
diff --git a/changes/bug4230 b/changes/bug4230
deleted file mode 100644
index c1ba584..0000000
--- a/changes/bug4230
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Resolve an integer overflow bug in smartlist_ensure_capacity.
-      Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by 
-      Mansour Moufid.
-