[tor-commits] [tor/release-0.2.8] More 0274-rc changelog updating

[nickm at torproject.org]

commit 89a9d8c8d75dac081dd304442182e29186888c39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 13:37:06 2015 -0400

    More 0274-rc changelog updating
---
 ChangeLog        | 11 +++++++++++
 changes/bug17364 |  3 ---
 changes/bug17403 |  3 ---
 changes/bug17404 |  6 ------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 259e4e5..077e8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   on different platforms. If no further significant bounds are found,
   the next release will the the official stable release.
 
+  o Major bugfixes (security, correctness):
+    - Fix a programming error that could cause us to read 4 bytes before
+      the beginning of an openssl string. This could be used to provoke
+      a crash on systems with an unusual malloc implementation, or
+      systems with unsual hardening installed. Fixes bug 17404; bugfix
+      on 0.2.3.6-alpha.
+
   o Major bugfixes (correctness):
     - Fix a use-after-free bug in validate_intro_point_failure(). Fixes
       bug 17401; bugfix on 0.2.7.3-rc.
@@ -13,6 +20,8 @@ Changes in version 0.2.7.4-rc - 2015-10-21
       17398; bugfix on 0.2.6.1-alpha.
     - Fix a memory leak in rend_cache_failure_entry_free(). Fixes bug
       17402; bugfix on 0.2.7.3-rc.
+    - Fix a memory leak when reading an expired signing key from disk.
+      Fixes bug 17403; bugfix on 0.2.7.2-rc.
 
   o Minor features (geoIP):
     - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2
@@ -51,6 +60,8 @@ Changes in version 0.2.7.4-rc - 2015-10-21
 
   o Documentation:
     - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
+    - Note that HiddenServicePorts can take a unix domain socket. Closes
+      ticket 17364.
 
 
 Changes in version 0.2.7.3-rc - 2015-09-25
diff --git a/changes/bug17364 b/changes/bug17364
deleted file mode 100644
index dd9ff12..0000000
--- a/changes/bug17364
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Note that HiddenServicePorts can take a unix domain socket.
-      Closes ticket 17364.
diff --git a/changes/bug17403 b/changes/bug17403
deleted file mode 100644
index e83a4a2..0000000
--- a/changes/bug17403
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leaks):
-    - Fix a memory leak when reading an expired signing key from disk.
-      Fixes bug 17403; bugfix on 0.2.7.2-rc.
diff --git a/changes/bug17404 b/changes/bug17404
deleted file mode 100644
index d524f66..0000000
--- a/changes/bug17404
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (security, correctness):
-    - Fix a programming error that could cause us to read 4 bytes before
-      the beginning of an openssl string. This could be used to provoke
-      a crash on systems with an unusual malloc implementation, or
-      systems with unsual hardening installed. Fixes bug 17404; bugfix
-      on 0.2.3.6-alpha.