summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2012-08-22 17:51:01 +0200
committerNick Mathewson <nickm@torproject.org>2012-08-22 12:35:13 -0400
commite0d5dec3e25e35c7a52240bfa2ecc7e1bc845d56 (patch)
treebd7a86d33b0be9310d920f1c7ebc4a3ac61ca1ea
parent09ac43bce23bf23431f8d191de241eb7e1776e4b (diff)
downloadtor-e0d5dec3e25e35c7a52240bfa2ecc7e1bc845d56.tar.gz
tor-e0d5dec3e25e35c7a52240bfa2ecc7e1bc845d56.zip
Remove #6480 fix from 0.2.2.38 changelog - it was not included
(Forward-port change from release-0.2.2 into release-0.2.3)
-rw-r--r--ChangeLog3
-rw-r--r--ReleaseNotes3
-rw-r--r--changes/note-releasenote-fix10
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 896fc7070a..3a1ad77930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,9 +4,6 @@ Changes in version 0.2.2.38 - 2012-08-12
could in theory leak path information.
o Security fixes:
- - Avoid read-from-freed-memory and double-free bugs that could occur
- when a DNS request fails while launching it. Fixes bug 6480;
- bugfix on 0.2.0.1-alpha.
- Avoid an uninitialized memory read when reading a vote or consensus
document that has an unrecognized flavor name. This read could
lead to a remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha.
diff --git a/ReleaseNotes b/ReleaseNotes
index e9f6055d4a..2782d37790 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -9,9 +9,6 @@ Changes in version 0.2.2.38 - 2012-08-12
could in theory leak path information.
o Security fixes:
- - Avoid read-from-freed-memory and double-free bugs that could occur
- when a DNS request fails while launching it. Fixes bug 6480;
- bugfix on 0.2.0.1-alpha.
- Avoid an uninitialized memory read when reading a vote or consensus
document that has an unrecognized flavor name. This read could
lead to a remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha.
diff --git a/changes/note-releasenote-fix b/changes/note-releasenote-fix
new file mode 100644
index 0000000000..586e2d2630
--- /dev/null
+++ b/changes/note-releasenote-fix
@@ -0,0 +1,10 @@
+
+ o Documentation fix:
+ Remove the following entry from the 0.2.2.38 changelog, since the patch
+ was not, in fact, included in 0.2.2.38:
+ .
+ - Avoid read-from-freed-memory and double-free bugs that could occur
+ when a DNS request fails while launching it. Fixes bug 6480;
+ bugfix on 0.2.0.1-alpha.
+ .
+ Fixes bug 6657; bugfix on 0.2.2.38.