Add bug29930 into changelog/releasenotes

diff --git a/ChangeLog b/ChangeLog
index eb606c178525dcdb87dca1ab49faa518fd24b851..2d1ca785d31d1d732c569e9b64d4b1ceed8deb99 100644 (file)
--- 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 3c8b3c9b182deca248dc6c5b37a80078f29a507c..53867617c0c6e3d6734ca99746811a86e67d9276 100644 (file)
--- 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 (file)
index a99b114..0000000
--- 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.
-