commit b82be6cf6643a438f846228225d2309f91f3c999 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Oct 19 21:39:50 2014 -0400 Fold 13471 into changelog and releasenotes --- ChangeLog | 5 +++++ ReleaseNotes | 5 +++++ changes/bug13471 | 5 ----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index da39a94..d5915b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ Changes in version 0.2.5.9-rc - 2014-10-xx today support TLS 1.0 or later, so we can safely turn off support for this old (and insecure) protocol. Fixes bug 13426. + o Major bugfixes (openssl bug workaround): + - Avoid crashing when using OpenSSL version 0.9.8zc, 1.0.0o, or + 1.0.1j, built with the 'no-ssl3' configuration option. Fixes + bug 13471. This is a workaround for an OpenSSL bug. + o Minor bugfixes: - Disable the sandbox name resolver cache when running tor-resolve: tor-resolve doesn't use the sandbox code, and turning it on was diff --git a/ReleaseNotes b/ReleaseNotes index fb045aa..7386c42 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -128,6 +128,11 @@ Changes in version 0.2.5.xx - 2014-10-xx attacker from causing a microdescriptor collision, because the router's identity is not forgeable. + o Major bugfixes (openssl bug workaround): + - Avoid crashing when using OpenSSL version 0.9.8zc, 1.0.0o, or + 1.0.1j, built with the 'no-ssl3' configuration option. Fixes + bug 13471. This is a workaround for an OpenSSL bug. + o Major bugfixes (client): - Perform circuit cleanup operations even when circuit construction operations are disabled (because the network is diff --git a/changes/bug13471 b/changes/bug13471 deleted file mode 100644 index c116a4a..0000000 --- a/changes/bug13471 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (openssl bug workaround): - - Avoid crashing when using OpenSSL version 0.9.8zc, 1.0.0o, or - 1.0.1j, built with the 'no-ssl3' configuration option. Fixes - bug 13471. This is a workaround for an OpenSSL bug. -