fold in changes files so far

7 files changed, 24 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index e1abfc1ab1..dcbb6a3438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+Changes in version 0.2.1.30 - 2011-02-??
+  o Major bugfixes:
+    - 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".
+    - If relays set RelayBandwidthBurst but not RelayBandwidthRate,
+      Tor would ignore their RelayBandwidthBurst setting,
+      potentially using more bandwidth than expected. Bugfix on
+      0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470.
+    - Ignore and warn if the user mistakenly sets "PublishServerDescriptor
+      hidserv" in her torrc. The 'hidserv' argument never controlled
+      publication of hidden service descriptors. Bugfix on 0.2.0.1-alpha.
+
+  o Minor features:
+    - Adjust our TLS Diffie-Hellman parameters to match those used by
+      Apache's mod_ssl.
+    - Update to the February 1 2011 Maxmind GeoLite Country database.
+
+  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".
+
+
 Changes in version 0.2.1.29 - 2011-01-15
   Tor 0.2.1.29 continues our recent code security audit work. The main
   fix resolves a remote heap overflow vulnerability that can allow remote
diff --git a/changes/bug2408 b/changes/bug2408
deleted file mode 100644
index 1d2dbf1ad6..0000000000
--- a/changes/bug2408
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes
-    - Ignore and warn about "PublishServerDescriptor hidserv" torrc
-      options.  The 'hidserv' argument never controlled publication
-      of hidden service descriptors.  Bugfix on 0.2.0.1-alpha.
-
-
diff --git a/changes/bug2470 b/changes/bug2470
deleted file mode 100644
index 8ff97b7bca..0000000000
--- a/changes/bug2470
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - If relays set RelayBandwidthBurst but not RelayBandwidthRate,
-      Tor would ignore their RelayBandwidthBurst setting,
-      potentially using more bandwidth than expected. Bugfix on
-      0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470.
diff --git a/changes/dhparam b/changes/dhparam
deleted file mode 100644
index cb31243ba9..0000000000
--- 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/geoip-feb2011 b/changes/geoip-feb2011
deleted file mode 100644
index 12eb0ac4b1..0000000000
--- a/changes/geoip-feb2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the February 1 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/policy_summarize-assert b/changes/policy_summarize-assert
deleted file mode 100644
index 619e8e7e42..0000000000
--- 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 340f2c3c2d..0000000000
--- 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.