Fold new entries into ChangeLog for 0.2.7.4-rc

14 files changed, 10 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f6c2d42ca..5041e7677c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,16 @@ 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 (memory leaks):
+    - Fix a memory leak in ed25519 batch signature checking.
+      Fixes bug 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.
+
+  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.
+
   o Minor features (geoIP):
     - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2
       Country database.
diff --git a/changes/bug15609 b/changes/bug15609
deleted file mode 100644
index efaccdeaae..0000000000
--- a/changes/bug15609
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Documentation:
-    - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
diff --git a/changes/bug17151 b/changes/bug17151
deleted file mode 100644
index 0993b90eac..0000000000
--- a/changes/bug17151
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (portability):
-    - Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of
-      bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak.
-
-  o Minor bugfixes (testing):
-    - Skip backtrace tests when backtrace support is not compiled in. Fixes
-      part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak.
diff --git a/changes/bug17154 b/changes/bug17154
deleted file mode 100644
index 6ad7b74468..0000000000
--- a/changes/bug17154
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (testing):
-    - Fix breakage when running 'make check' with BSD make. Fixes bug
-      17154; bugfix on 0.2.7.3-rc. Patch by Marcin Cieślak.
diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv
deleted file mode 100644
index d5132114b4..0000000000
--- a/changes/bug17173-socket-hack-rv
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bug fixes (addresses, testing):
-    - Add unit tests for get_interface_address* failure cases.
-      Fixes bug 17173; bugfix on 0.2.7.3-rc.  Patch by fk/teor.
diff --git a/changes/bug17237_027 b/changes/bug17237_027
deleted file mode 100644
index e5978d0ec8..0000000000
--- a/changes/bug17237_027
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (compilation):
-    - Repair compilation with the most recent (unreleased, alpha)
-      vesions of OpenSSL 1.1. Fixes part of ticket 17237.
diff --git a/changes/bug17251 b/changes/bug17251
deleted file mode 100644
index edd7739d2f..0000000000
--- a/changes/bug17251
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Fix an integer overflow warning in test_crypto_slow.c.
-      Fixes bug 17251; bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug17347 b/changes/bug17347
deleted file mode 100644
index 487b1320e2..0000000000
--- a/changes/bug17347
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Fix compilation of sandbox.c with musl-libc.
-      Fixes bug 17347; bugfix on 0.2.5.1-alpha.
-      Patch from 'jamestk'.
diff --git a/changes/bug17354 b/changes/bug17354
deleted file mode 100644
index 53da007fbb..0000000000
--- a/changes/bug17354
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (sandbox):
-    - Add the "hidserv-stats" filename to our sandbox filter for the
-      HiddenServiceStatistics option to work properly. Fixes bug 17354;
-      bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
diff --git a/changes/bug17398 b/changes/bug17398
deleted file mode 100644
index 66e27a6966..0000000000
--- a/changes/bug17398
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leaks):
-    - Fix a memory leak in ed25519 batch signature checking.
-      Fixes bug 17398; bugfix on 0.2.6.1-alpha.
diff --git a/changes/bug17401 b/changes/bug17401
deleted file mode 100644
index a22f79c431..0000000000
--- a/changes/bug17401
+++ /dev/null
@@ -1,3 +0,0 @@
-  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.
diff --git a/changes/bug17402 b/changes/bug17402
deleted file mode 100644
index 4760e00b04..0000000000
--- a/changes/bug17402
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes (memory leak):
-    - Fix a memory leak in rend_cache_failure_entry_free().
-      Fixes bug 17402; bugfix on 0.2.7.3-rc.
diff --git a/changes/geoip-october2015 b/changes/geoip-october2015
deleted file mode 100644
index f20febec5a..0000000000
--- a/changes/geoip-october2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs
deleted file mode 100644
index 6b5ed4d484..0000000000
--- a/changes/ifaddrs-tests-network-configs
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (testing):
-    - Make the get_ifaddrs_* unit tests more tolerant of different network
-      configurations. (Don't assume every test box has an IPv4 address, and
-      Don't assume every test box has a non-localhost address.
-      Fixes bug 17255; bugfix on 0.2.7.3-rc.  Patch by "teor".