[tor-commits] [tor/release-0.2.6] Adjust 0.2.6.11 changelog entry from 0.3.0.4-rc to match

[nickm@xxxxxxxxxxxxxx]

commit 1f0909fd346bca6725da995c94fc37e6a52d10e5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:05:35 2017 -0500

    Adjust 0.2.6.11 changelog entry from 0.3.0.4-rc to match
---
 ChangeLog | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e74a18c..83de1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,14 +99,13 @@ Changes in version 0.2.6.11 - 2017-03-??
       0.2.1.10-alpha. Found by Yuan Jochen Kang, Suman Jana, and
       Baishakhi Ray.
 
-  o Major bugfixes (parsing, also in 0.3.0.4-rc):
-    - Fix an integer underflow bug when comparing malformed Tor versions.
-      This bug is harmless, except when Tor has been built with
-      --enable-expensive-hardening, which would turn it into a crash;
-      or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with
-      -ftrapv by default.
-      Part of TROVE-2017-001. Fixes bug 21278; bugfix on
-      0.0.8pre1. Found by OSS-Fuzz.
+  o Major bugfixes (parsing, backported from 0.3.0.4-rc):
+    - Fix an integer underflow bug when comparing malformed Tor
+      versions. This bug could crash Tor when built with
+      --enable-expensive-hardening, or on Tor 0.2.9.1-alpha through Tor
+      0.2.9.8, which were built with -ftrapv by default. In other cases
+      it was harmless. Part of TROVE-2017-001. Fixes bug 21278; bugfix
+      on 0.0.8pre1. Found by OSS-Fuzz.
 
 
 Changes in version 0.2.6.10 - 2015-07-12

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