[tor-commits] [tor/release-0.2.3] Have the bug6252 commit message reflect its on-again/off-again status

[arma at torproject.org]

commit 393944dfb67fb27991e152ec67f74cebbf3a23ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 10:24:17 2012 -0400

    Have the bug6252 commit message reflect its on-again/off-again status
---
 changes/bug6252       |    8 --------
 changes/bug6252_again |   11 +++++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/changes/bug6252 b/changes/bug6252
deleted file mode 100644
index 0d29203..0000000
--- a/changes/bug6252
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Security fixes:
-    - Tear down the circuit if we get an unexpected SENDME cell. Clients
-      could use this trick to make their circuits receive cells faster
-      than our flow control would have allowed, or to gum up the network,
-      or possibly to do targeted memory denial-of-service attacks on
-      entry nodes. Fixes bug 6252. Bugfix on the 54th commit on Tor --
-      from July 2002, before the release of Tor 0.0.0.
-
diff --git a/changes/bug6252_again b/changes/bug6252_again
new file mode 100644
index 0000000..f7fd00c
--- /dev/null
+++ b/changes/bug6252_again
@@ -0,0 +1,11 @@
+  o Security fixes:
+    - Tear down the circuit if we get an unexpected SENDME cell. Clients
+      could use this trick to make their circuits receive cells faster
+      than our flow control would have allowed, or to gum up the network,
+      or possibly to do targeted memory denial-of-service attacks on
+      entry nodes. Fixes bug 6252. Bugfix on the 54th commit on Tor --
+      from July 2002, before the release of Tor 0.0.0.  We had committed
+      this patch previously, but we had to revert it because of bug 6271.
+      Now that 6271 is fixed, this appears to work.
+
+