[tor-commits] [tor/release-0.2.4] fold in next changes entry

arma at torproject.org arma at torproject.org
Sun Dec 22 23:27:32 UTC 2013


commit 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Dec 22 18:34:37 2013 -0500

    fold in next changes entry
---
 ChangeLog        |    2 ++
 ReleaseNotes     |    2 ++
 changes/bug10465 |    3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 066bb9d..595e259 100644
--- 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 ad9121b..54195f8 100644
--- 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
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.



More information about the tor-commits mailing list