Incorporate changes from 0.2.4.20 into 0.2.5.2 changelog-in-progress

diff --git a/ChangeLog b/ChangeLog
index c9ed9fdc3111560776a6eef98cf666924ee841ad..8818d2a433c716d8514cb1733f46c69b6b167d51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,12 +74,38 @@ ALSO IN 0.2.4.18-rc
 ==============================
 ALSO IN 0.2.4.19:
 
+  (Nothing, since 0.2.4.19 is the same as 0.2.4.18-rc)
 
 ==============================
 ALSO IN 0.2.4.20:
 
+  o Major bugfixes:
+    - Do not allow OpenSSL engines to replace the PRNG, even when
+      HardwareAccel is set. The only default builtin PRNG engine uses
+      the Intel RDRAND instruction to replace the entire PRNG, and
+      ignores all attempts to seed it with more entropy. That's
+      cryptographically stupid: the right response to a new alleged
+      entropy source is never to discard all previously used entropy
+      sources. Fixes bug 10402; works around behavior introduced in
+      OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman"
+      and "rl1987".
 
+  o Minor bugfixes:
+    - Avoid a crash bug when starting with a corrupted microdescriptor
+      cache file. Fix for bug 10406; bugfix on 0.2.2.6-alpha.
+  o Minor bugfixes:
+    - If we fail to dump a previously cached microdescriptor to disk, avoid
+      freeing duplicate data later on. Fix for bug 10423; bugfix on
+      0.2.4.13-alpha. Spotted by "bobnomnom".
+  o Major bugfixes:
+    - Avoid launching spurious extra circuits when a stream is pending.
+      This fixes a bug where any circuit that _wasn't_ unusable for new
+      streams would be treated as if it were, causing extra circuits to
+      be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha.
 
+  o Major bugfixes:
+    - Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+      address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
 
 ==============================
 

diff --git a/changes/bug10402 b/changes/bug10402
deleted file mode 100644 (file)
index eac00bd..0000000
--- a/changes/bug10402
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Major bugfixes:
-    - Do not allow OpenSSL engines to replace the PRNG, even when
-      HardwareAccel is set. The only default builtin PRNG engine uses
-      the Intel RDRAND instruction to replace the entire PRNG, and
-      ignores all attempts to seed it with more entropy. That's
-      cryptographically stupid: the right response to a new alleged
-      entropy source is never to discard all previously used entropy
-      sources. Fixes bug 10402; works around behavior introduced in
-      OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman"
-      and "rl1987".
-

diff --git a/changes/bug10409 b/changes/bug10409
deleted file mode 100644 (file)
index 5ef5ae2..0000000
--- a/changes/bug10409
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Avoid a crash bug when starting with a corrupted microdescriptor
-      cache file. Fix for bug 10406; bugfix on 0.2.2.6-alpha.

diff --git a/changes/bug10423 b/changes/bug10423
deleted file mode 100644 (file)
index 493b7b1..0000000
--- a/changes/bug10423
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - If we fail to dump a previously cached microdescriptor to disk, avoid
-      freeing duplicate data later on. Fix for bug 10423; bugfix on
-      0.2.4.13-alpha. Spotted by "bobnomnom".

diff --git a/changes/bug10456 b/changes/bug10456
deleted file mode 100644 (file)
index fb3b92f..0000000
--- a/changes/bug10456
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Avoid launching spurious extra circuits when a stream is pending.
-      This fixes a bug where any circuit that _wasn't_ unusable for new
-      streams would be treated as if it were, causing extra circuits to
-      be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha.
-

diff --git a/changes/bug10465 b/changes/bug10465
deleted file mode 100644 (file)
index 330f969..0000000
--- a/changes/bug10465
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - Fix assertion failure when AutomapHostsOnResolve yields an IPv6
-      address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.