[tor-commits] [tor/master] Remove #6480 fix from 0.2.2.38 changelog - it was not included

[nickm@xxxxxxxxxxxxxx]

commit 5b0ed1e344f47a584d529221fb9d39e54715732c
Author: Peter Palfrader <peter@xxxxxxxxxxxxx>
Date:   Wed Aug 22 17:51:01 2012 +0200

    Remove #6480 fix from 0.2.2.38 changelog - it was not included
    
    (Forward-port from release-0.2.2 to master)
---
 ChangeLog                    |    3 ---
 ReleaseNotes                 |    3 ---
 changes/note-releasenote-fix |   10 ++++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 896fc70..3a1ad77 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 e9f6055..2782d37 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 0000000..586e2d2
--- /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.

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits