[tor-commits] [tor/master] and forward-port those lines too

[arma at torproject.org]

commit 107b347eb3b8e53fdf04cfe84a243bc5c9e5f8b0
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Dec 22 18:37:49 2013 -0500

    and forward-port those lines too
---
 ChangeLog    |    2 ++
 ReleaseNotes |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a758835..0863b61 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