commit 589ed3f771f1d77d9d5e366ba60849c2babb49e0 Author: Roger Dingledine arma@torproject.org Date: Thu Sep 1 20:49:21 2011 -0400
fold in last changes item --- ChangeLog | 2 ++ changes/bug3888 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index a28b2b2..7084a0f 100644 --- 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 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. -