[or-cvs] [tor/release-0.2.2] fold in changelog entries

[arma@xxxxxxxxxxxxxx]

commit da3a4293f8b83765fe8c93600a6a62d4dd8f6f75
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Mon Jan 24 23:24:34 2011 -0500

    fold in changelog entries
---
 ChangeLog                       |   16 ++++++++++++++++
 changes/dhparam                 |    3 ---
 changes/policy_summarize-assert |    6 ------
 changes/routerparse_maxima      |    4 ----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2bf2f62..a2c6924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes in version 0.2.2.22-alpha - 2011-01-25
+  o Major bugfixes (security):
+    - Fix a bounds-checking error that could allow an attacker to
+      remotely crash a directory authority. Bugfix on 0.2.1.5-alpha.
+      Found by "piebeer".
+
+  o Minor features:
+    - Adjust our TLS Diffie-Hellman parameters to match those used by
+      Apache's mod_ssl.
+
+  o Minor bugfixes:
+    - Check for and reject overly long directory certificates and
+      directory tokens before they have a chance to hit any assertions.
+      Bugfix on 0.2.1.28 / 0.2.2.20-alpha. Found by "doorss".
+
+
 Changes in version 0.2.2.21-alpha - 2011-01-15
   Tor 0.2.2.21-alpha includes all the patches from Tor 0.2.1.29, which
   continues our recent code security audit work. The main fix resolves
diff --git a/changes/dhparam b/changes/dhparam
deleted file mode 100644
index cb31243..0000000
--- a/changes/dhparam
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features
-    - Adjust our TLS Diffie-Hellman parameters to match those used by
-      Apache's mod_ssl.
diff --git a/changes/policy_summarize-assert b/changes/policy_summarize-assert
deleted file mode 100644
index 619e8e7..0000000
--- a/changes/policy_summarize-assert
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (security)
-    - Fix a bounds-checking error that could allow an attacker to
-      remotely crash a directory authority.  Found by piebeer.
-      Bugfix on 0.2.1.5-alpha.
-
-
diff --git a/changes/routerparse_maxima b/changes/routerparse_maxima
deleted file mode 100644
index 340f2c3..0000000
--- a/changes/routerparse_maxima
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes
-    - Check for and reject overly long directory certificates and
-      directory tokens before they have a chance to hit any
-      assertions. Bugfix on 0.2.1.28. Found by doorss.