fold in the changelog entries

7 files changed, 34 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index ec7d92065f..e417cf2683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+Changes in version 0.2.1.26 - 2010-05-0?
+  o Major bugfixes:
+    - Teach relays to defend themselves from connection overload. Relays
+      now close idle circuits early if it looks like they were intended
+      for directory fetches. Relays are also more aggressive about closing
+      TLS connections that have no circuits on them. Such circuits are
+      unlikely to be re-used, and tens of thousands of them were piling
+      up at the fast relays, causing the relays to run out of sockets
+      and memory. Bugfix on 0.2.0.22-rc (where clients started tunneling
+      their directory fetches over TLS).
+    - Fix SSL renegotiation behavior on OpenSSL versions like on Centos
+      that claim to be earlier than 0.9.8m, but which have in reality
+      backported huge swaths of 0.9.8m or 0.9.8n renegotiation
+      behavior. Possible fix for some cases of bug 1346.
+    - Directory mirrors were fetching relay descriptors only from v2
+      directory authorities, rather than v3 authorities like they should.
+      Only 2 v2 authorities remain (compared to 7 v3 authorities), leading
+      to a serious bottleneck. Bugfix on 0.2.0.9-alpha. Fixes bug 1324.
+
+  o Minor bugfixes:
+    - Finally get rid of the deprecated and now harmful notion of "clique
+      mode", where directory authorities maintain TLS connections to
+      every other relay.
+
+  o Testsuite fixes:
+    - In the util/threads test, no longer free the test_mutex before all
+      worker threads have finished. Bugfix on 0.2.1.6-alpha.
+    - The master thread could starve the worker threads quite badly on
+      certain systems, causing them to run only partially in the allowed
+      window. This resulted in test failures. Now the master thread sleeps
+      occasionally for a few microseconds while the two worker-threads
+      compete for the mutex. Bugfix on 0.2.0.1-alpha.
+
+
 Changes in version 0.2.1.25 - 2010-03-16
   Tor 0.2.1.25 fixes a regression introduced in 0.2.1.23 that could
   prevent relays from guessing their IP address correctly. It also fixes
diff --git a/changes/1324-fetch-from-v3-not-v2 b/changes/1324-fetch-from-v3-not-v2
deleted file mode 100644
index 7026980558..0000000000
--- a/changes/1324-fetch-from-v3-not-v2
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Directory mirrors were fetching relay descriptors only from v2
-      directory authorities, rather than v3 authorities like they should.
-      Only 2 v2 authorities remain (compared to 7 v3 authorities), leading
-      to a serious bottleneck. Bugfix on 0.2.0.9-alpha. Fixes bug 1324.
diff --git a/changes/close_begindir_circs b/changes/close_begindir_circs
deleted file mode 100644
index 3b1ee879c5..0000000000
--- a/changes/close_begindir_circs
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes:
-    - Relays now close idle circuits early if it looks like they were
-      intended for directory fetches. Such circuits are unlikely to
-      be re-used, and tens of thousands of them were piling up at the
-      fast relays, causing the relays to run out of sockets and memory.
-      Bugfix on 0.2.0.22-rc (where clients started tunneling their
-      directory fetches over TLS).
diff --git a/changes/close_idle_conns_faster b/changes/close_idle_conns_faster
deleted file mode 100644
index 9eff607c37..0000000000
--- a/changes/close_idle_conns_faster
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Make relays more aggressive about closing TLS connections that
-      have no circuits on them. Tens of thousands of them were piling
-      up at the fast relays, causing the relays to run out of sockets
-      and memory. Bugfix on 0.2.0.22-rc (where clients started tunneling
-      their directory fetches over TLS).
diff --git a/changes/kill_clique_mode b/changes/kill_clique_mode
deleted file mode 100644
index 82283a8ea7..0000000000
--- a/changes/kill_clique_mode
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Finally get rid of the deprecated and now harmful notion of
-      "clique mode", where directory authorities maintain TLS connections
-      to every other relay.
diff --git a/changes/use_ssl_option_everywhere b/changes/use_ssl_option_everywhere
deleted file mode 100644
index 02adb3c8b4..0000000000
--- a/changes/use_ssl_option_everywhere
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fix SSL renegotiation behavior on OpenSSL versions that claim to
-      be earlier than 0.9.8m, but which have in reality backported huge
-      swaths of 0.9.8m or 0.9.8n renegotiation behavior.  Possibly fix
-      for some cases of bug 1346.
diff --git a/changes/weasel-testuite-thread-fixes b/changes/weasel-testuite-thread-fixes
deleted file mode 100644
index 4c32c3881a..0000000000
--- a/changes/weasel-testuite-thread-fixes
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-    - Testsuite:  In the util/threads test no longer free the test_mutex
-      before all worker threads have finished.
-    - Testsuite:  The master thread could starve the worker threads quite
-      badly on certain systems, causing them to run only partially in
-      the allowed window.  This resulted in test failures.  Now the master
-      thread sleeps occasionally for a few microseconds while the two
-      worker-threads compete for the mutex.