[tor-commits] [tor/release-0.4.1] more entries for 0.4.1.4-rc changelog

[nickm at torproject.org]

commit f05624030a88bd8e3c96b9784e649c4bd2d521d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 25 11:02:29 2019 -0400

    more entries for 0.4.1.4-rc changelog
---
 ChangeLog            | 15 +++++++++++++++
 changes/bug31024     |  4 ----
 changes/bug31027     |  3 ---
 changes/bug31080_041 |  4 ----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca6ebaff2..a3e6d014f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,16 +25,31 @@ Changes in version 0.4.1.4-rc - 2019-07-??
       logging a warn about it being absent. Fixes bug 30649; bugfix
       on 0.4.1.1-alpha.
 
+  o Minor bugfixes (circuitpadding):
+    - Add two NULL checks in unreachable places to silence Coverity (CID
+      144729 and 1447291) and better future proof ourselves. Fixes bug
+      31024; bugfix on 0.4.1.1-alpha.
+
   o Minor bugfixes (crash on exit):
     - Avoid a set of possible code paths that could use try to use freed
       memory in routerlist_free() while Tor was exiting. Fixes bug
       31003; bugfix on 0.1.2.2-alpha.
 
+  o Minor bugfixes (logging):
+    - Fix a conflict between the flag used for messaging-domain log
+      messages, and the LD_NO_MOCK testing flag. Fixes bug 31080; bugfix
+      on 0.4.1.1-alpha.
+
   o Minor bugfixes (memory leaks):
     - Fix a trivial memory leak when parsing an invalid value from a
       download schedule in the configuration. Fixes bug 30894; bugfix
       on 0.3.4.1-alpha.
 
+  o Code simplification and refactoring:
+    - Remove some dead code from circpad_machine_remove_token() to fix
+      some Coverity warnings (CID 1447298). Fixes bug 31027; bugfix
+      on 0.4.1.1-alpha.
+
 
 Changes in version 0.4.1.3-alpha - 2019-06-25
   Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous
diff --git a/changes/bug31024 b/changes/bug31024
deleted file mode 100644
index 888fb2a26..000000000
--- a/changes/bug31024
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (circuitpadding):
-    - Add two NULL checks in unreachable places to silence Coverity (CID 144729
-      and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix
-      on 0.4.1.1-alpha.
\ No newline at end of file
diff --git a/changes/bug31027 b/changes/bug31027
deleted file mode 100644
index dd3ce20b6..000000000
--- a/changes/bug31027
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Remove some dead code from circpad_machine_remove_token() to fix some
-      Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha.
\ No newline at end of file
diff --git a/changes/bug31080_041 b/changes/bug31080_041
deleted file mode 100644
index 1fe9ec508..000000000
--- a/changes/bug31080_041
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (logging):
-    - Fix a conflict between the flag used for messaging-domain
-      log messages, and the LD_NO_MOCK testing flag. Fixes bug 31080;
-      bugfix on 0.4.1.1-alpha.