[tor-commits] [tor/release-0.4.0] Fold 29693 into changelog

[nickm at torproject.org]

commit eaa34dd6b9cf3ce99e153b175177842f56ef1d1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 22 11:18:17 2019 -0400

    Fold 29693 into changelog
---
 ChangeLog        | 2 ++
 changes/bug29693 | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07e5ecace..4727eb5e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,8 @@ Changes in version 0.4.0.3-alpha - 2019-03-22
       29530; bugfix on 0.3.5.8.
     - Fix our gcov wrapper script to look for object files at the
       correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha.
+    - Decrease the false positive rate of stochastic probability
+      distribution tests. Fixes bug 29693; bugfix on 0.4.0.1-alpha.
 
   o Minor bugfixes (Windows, CI):
     - Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit
diff --git a/changes/bug29693 b/changes/bug29693
deleted file mode 100644
index 33ce051c4..000000000
--- a/changes/bug29693
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (unit tests):
-    - Decrease the false positive rate of stochastic probability distribution
-      tests. Fixes bug 29693; bugfix on 0.4.0.1-alpha.
\ No newline at end of file