Browse Source

Remove #6480 fix from 0.2.2.38 changelog - it was not included

(Forward-port from release-0.2.2 to master)
Peter Palfrader 11 years ago
parent
commit
5b0ed1e344
3 changed files with 10 additions and 6 deletions
  1. 0 3
      ChangeLog
  2. 0 3
      ReleaseNotes
  3. 10 0
      changes/note-releasenote-fix

+ 0 - 3
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.

+ 0 - 3
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.

+ 10 - 0
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.