[or-cvs] [tor/release-0.2.1 09/12] fold in changelog entry

[arma@xxxxxxxxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Thu, 16 Dec 2010 17:02:21 -0500
Subject: fold in changelog entry
Commit: 4170a11398789a5a8b93eeb1db20e780dcd4dbfe

---
 ChangeLog            |    6 ++++++
 changes/security_bug |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 changes/security_bug

diff --git a/ChangeLog b/ChangeLog
index 3131594..01e858f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 Changes in version 0.2.1.28 - 2010-12-16
+  o Major bugfixes:
+    - Fix a remotely exploitable bug that could be used to crash instances
+      of Tor remotely by overflowing on the heap. Remote-code execution
+      hasn't been confirmed, but can't be ruled out. Everyone should
+      upgrade. Bugfix on the 0.1.1 series and later.
+
   o Directory authority changes:
     - Change IP address and ports for gabelmoo (v3 directory authority).
 
diff --git a/changes/security_bug b/changes/security_bug
deleted file mode 100644
index 990beee..0000000
--- a/changes/security_bug
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fix a remotely exploitable bug that could be used to crash instances
-      of Tor remotely by overflowing on the heap.  Remove-code execution
-      hasn't been confirmed, but can't be ruled out.  Obviously, everyone
-      should upgrade.  Bugfix on the 0.1.1 series and later.
-- 
1.7.1