fold in changes entries

7 files changed, 26 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 595e259793..876152d5bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Changes in version 0.2.4.21 - 2014-02-1?
+
+  o Minor features:
+    - Always clear OpenSSL bignums before freeing them -- even bignums
+      that don't contain secrets. Resolves ticket 10793. Patch by
+      Florent Daigniere.
+
+  o Minor bugfixes:
+    - Set the listen() backlog limit to the largest actually supported
+      on the system, not to the value in a header file. Fixes bug 9716;
+      bugfix on every released Tor.
+    - Avoid a segfault on SIGUSR1, where we had freed a connection but did
+      not entirely remove it from the connection lists. Fixes bug 9602;
+      bugfix on 0.2.4.4-alpha.
+    - Fix a segmentation fault in our benchmark code when running with
+      Fedora's OpenSSL package, or any other OpenSSL that provides
+      ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha.
+    - Move log message about circuit handshake counts into the heartbeat
+      message where it belongs, instead of logging it once per hour
+      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
+
+  o Documentation fixes:
+    - Document that all but one DirPort entry must have the NoAdvertise
+      flag set. Fixes bug 10470; bugfix on 0.2.3.3-alpha / 0.2.3.16-alpha.
+
+
 Changes in version 0.2.4.20 - 2013-12-22
   Tor 0.2.4.20 fixes potentially poor random number generation for users
   who 1) use OpenSSL 1.0.0 or later, 2) set "HardwareAccel 1" in their
diff --git a/changes/bug10470 b/changes/bug10470
deleted file mode 100644
index 2b753436d9..0000000000
--- a/changes/bug10470
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation fixes:
-    - Note that all but one DirPort entry must have the NoAdvertise flag
-      set. Fix for #10470.
-
diff --git a/changes/bug10485 b/changes/bug10485
deleted file mode 100644
index 7e5fa530e8..0000000000
--- a/changes/bug10485
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Move message about circuit handshake counts into the heartbeat
-      message where it belongs, instead of logging it once per hour
-      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
diff --git a/changes/bug10793 b/changes/bug10793
deleted file mode 100644
index 24c4025dde..0000000000
--- a/changes/bug10793
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (security):
-    - Always clear OpenSSL bignums before freeing them--even bignums
-      that don't contain secrets. Resolves ticket 10793. Patch by
-      Florent Daigniere.
diff --git a/changes/bug10835 b/changes/bug10835
deleted file mode 100644
index 9df7bdd279..0000000000
--- a/changes/bug10835
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (testing):
-    - Fix a segmentation fault in our benchmark code when running with
-      Fedora's OpenSSL package, or any other OpenSSL that provides
-      ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug9602 b/changes/bug9602
deleted file mode 100644
index 2dc13c4c02..0000000000
--- a/changes/bug9602
+++ /dev/null
@@ -1,5 +0,0 @@
- o Bugfixes
-   - Null out orconn->chan->conn when closing orconn in case orconn is freed
-     before channel_run_cleanup() gets to orconn->chan, and handle the null
-     conn edge case correctly in channel_tls_t methods.  Fixes bug #9602;
-     bugfix on 0.2.4.4-alpha.
diff --git a/changes/bug9716 b/changes/bug9716
deleted file mode 100644
index 5e39077173..0000000000
--- a/changes/bug9716
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Bugfixes (performance):
-    - Set the listen() backlog limit to the largest actually supported
-      on the system, not to the value in a header file. Fixes bug 9716;
-      bugfix on every released Tor.