[tor-commits] [tor/release-0.4.2] start on changelog for 0.4.2.5

[nickm at torproject.org]

commit a0f80026d0a813ffeab2ad51e26290cf46dd1ed4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 12:18:50 2019 -0500

    start on changelog for 0.4.2.5
---
 ChangeLog           | 10 ++++++++++
 changes/ticket32500 |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f23fa1cf..12685beb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes in version 0.4.2.5 - 2019-12-??
+  Blurb blurb.
+
+  o Testing (backport from 0.4.2.5):
+    - Require C99 standards-conforming code in Travis CI, but allow GNU
+      gcc extensions. Also activates clang's -Wtypedef-redefinition
+      warnings. Build some jobs with -std=gnu99, and some jobs without.
+      Closes ticket 32500.
+
+
 Changes in version 0.4.2.4-rc - 2019-11-15
   Tor 0.4.2.4-rc is the first release candidate in its series. It fixes
   several bugs from earlier versions, including a few that would result in
diff --git a/changes/ticket32500 b/changes/ticket32500
deleted file mode 100644
index 2c0f35df7..000000000
--- a/changes/ticket32500
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Testing:
-    - Require C99 standards-conforming code in Travis CI, but allow GNU gcc
-      extensions. Also activates clang's -Wtypedef-redefinition warnings.
-      Build some jobs with -std=gnu99, and some jobs without.
-      Closes ticket 32500.