fold in last changes item

diff --git a/ChangeLog b/ChangeLog
index a28b2b2b95526b5818dc40425dac568e1a43b291..7084a0f3ace58eea5fe9c05adfd5697cfbe7b20d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,8 @@ Changes in version 0.2.3.3-alpha - 2011-09-01
       without flushing it completely. Fixes bug 3805.
     - Fix a bug where server-side tunneled bufferevent-based directory
       streams would get closed prematurely. Fixes bug 3814.
+    - Fix a use-after-free error with per-connection rate-limiting
+      buckets. Fixes bug 3888.
 
   o Major bugfixes (also part of 0.2.2.31-rc):
     - If we're configured to write our ControlPorts to disk, only write

diff --git a/changes/bug3888 b/changes/bug3888
deleted file mode 100644 (file)
index d3a5e27..0000000
--- a/changes/bug3888
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (bufferevents, fix on 0.2.3.1-alpha):
-    - Fix a use-after-free error with per-connection rate-limiting
-      buckets. Fixes bug 3888.
-