[tor-commits] [tor/release-0.3.4] Last two changelog entries for 0.3.4.6-rc

[nickm at torproject.org]

commit 6045c26d8442913e936e640fcf165ebfcc9d4bf1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 7 08:09:06 2018 -0400

    Last two changelog entries for 0.3.4.6-rc
---
 ChangeLog        | 11 +++++++++++
 changes/bug26994 |  3 ---
 changes/bug27003 |  6 ------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41e39982b..84a3f1045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Changes in version 0.3.4.6-rc - 2018-08-06
   release candidate: if no serious bugs are found, we expect that the
   stable 0.3.4 release will be (almost) the same as this release.
 
+  o Major bugfixes (event scheduler):
+    - When we enable a periodic event, schedule it in the event loop
+      rather than running it immediately. Previously, we would re-run
+      periodic events immediately in the middle of (for example)
+      changing our options, with unpredictable effects. Fixes bug 27003;
+      bugfix on 0.3.4.1-alpha.
+
   o Minor features (compilation):
     - When building Tor, prefer to use Python 3 over Python 2, and more
       recent (contemplated) versions over older ones. Closes
@@ -38,6 +45,10 @@ Changes in version 0.3.4.6-rc - 2018-08-06
     - Fix a number of small memory leaks identified by coverity. Fixes
       bug 26467; bugfix on numerous Tor versions.
 
+  o Minor bugfixes (portability):
+    - Avoid a compilation error in test_bwmgt.c on Solaris 10. Fixes bug
+      26994; bugfix on 0.3.4.1-alpha.
+
   o Minor bugfixes (testing, compatibility):
     - When running the ntor_ref.py and hs_ntor_ref.py tests, make sure
       only to pass strings (rather than "bytes" objects) to the Python
diff --git a/changes/bug26994 b/changes/bug26994
deleted file mode 100644
index 664894a7f..000000000
--- a/changes/bug26994
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (portability):
-    - Avoid a compilation error in test_bwmgt.c on Solaris 10.
-      Fixes bug 26994; bugfix on 0.3.4.1-alpha.
diff --git a/changes/bug27003 b/changes/bug27003
deleted file mode 100644
index 4f2045afc..000000000
--- a/changes/bug27003
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (event scheduler):
-    - When we enable a periodic event, schedule it in the event loop
-      rather than running it immediately. Previously, we would re-run
-      periodic events immediately in the middle of (for example)
-      changing our options, with unpredictable effects.  Fixes bug
-      27003; bugfix on 0.3.4.1-alpha.