fold in next changes entry

diff --git a/ChangeLog b/ChangeLog
index 066bb9da0ceb7f425eb2444449245567d47ebcd3..595e259793c1950add31d11ca473f5a37ed7130a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Changes in version 0.2.4.20 - 2013-12-22
       sources. Fixes bug 10402; works around behavior introduced in
       OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman"
       and "rl1987".
+    - Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+      address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
     - 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

diff --git a/ReleaseNotes b/ReleaseNotes
index ad9121b7197a0141461601e59edfa7c11f1fd627..54195f82ae5baf316fb7f098849a272c078586b3 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -24,6 +24,8 @@ Changes in version 0.2.4.20 - 2013-12-22
       sources. Fixes bug 10402; works around behavior introduced in
       OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman"
       and "rl1987".
+    - Fix assertion failure when AutomapHostsOnResolve yields an IPv6
+      address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.
     - 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

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.