[tor-commits] [tor/release-0.4.0] Add bug29930 into changelog/releasenotes

[nickm at torproject.org]

commit bf071e34aa26e0965910d1adf424e8134b8d45d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 2 08:50:45 2019 -0400

    Add bug29930 into changelog/releasenotes
---
 ChangeLog        | 4 ++++
 ReleaseNotes     | 4 ++++
 changes/bug29930 | 4 ----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb606c178..2d1ca785d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,10 @@ Changes in version 0.4.0.5 - 2019-05-02
     - Check the time in the "Expires" header using approx_time(). Fixes
       bug 30001; bugfix on 0.4.0.4-rc.
 
+  o Minor bugfixes (UI):
+    - Lower log level of unlink() errors during bootstrap. Fixes bug
+      29930; bugfix on 0.4.0.1-alpha.
+
 
 Changes in version 0.4.0.4-rc - 2019-04-11
   Tor 0.4.0.4-rc is the first release candidate in its series; it fixes
diff --git a/ReleaseNotes b/ReleaseNotes
index 3c8b3c9b1..53867617c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -516,6 +516,10 @@ Changes in version 0.4.0.5 - 2019-05-02
       was causing Stem integration tests to stall in some cases. Fixes
       bug 30021; bugfix on 0.2.4.8-alpha.
 
+  o Minor bugfixes (UI):
+    - Lower log level of unlink() errors during bootstrap. Fixes bug
+      29930; bugfix on 0.4.0.1-alpha.
+
   o Minor bugfixes (usability):
     - Stop saying "Your Guard ..." in pathbias_measure_{use,close}_rate().
       Some users took this phrasing to mean that the mentioned guard was
diff --git a/changes/bug29930 b/changes/bug29930
deleted file mode 100644
index a99b11430..000000000
--- a/changes/bug29930
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (UI):
-    - Lower log level of unlink() errors during bootstrap. Fixes bug 29930;
-      bugfix on 0.4.0.1-alpha.
-