From: Roger Dingledine Date: Sun, 22 Dec 2013 23:37:49 +0000 (-0500) Subject: and forward-port those lines too X-Git-Tag: tor-0.2.5.2-alpha~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=107b347eb3b8e53fdf04cfe84a243bc5c9e5f8b0;p=thirdparty%2Ftor.git and forward-port those lines too --- diff --git a/ChangeLog b/ChangeLog index a758835fd3..0863b61c45 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 ad9121b719..54195f82ae 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