diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-12-22 18:34:37 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-12-22 18:34:37 -0500 |
| commit | 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee (patch) | |
| tree | 9d8f07c35764047ea3fe118f6908e18bc6a4dc00 | |
| parent | ce43072831250eb5e0a089bd2cf092c34701eebf (diff) | |
| download | tor-3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee.tar.gz tor-3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee.zip | |
fold in next changes entrytor-0.2.4.20
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ReleaseNotes | 2 | ||||
| -rw-r--r-- | changes/bug10465 | 3 |
3 files changed, 4 insertions, 3 deletions
@@ -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 diff --git a/changes/bug10465 b/changes/bug10465 deleted file mode 100644 index 330f969416..0000000000 --- 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. |