[tor-commits] [tor/release-0.4.3] Fold a few more entries into the 0.4.3.3-alpha changelog

[nickm at torproject.org]

commit 51a2802a03cc4c115aca23b86a04d1de812a9dd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:54:00 2020 -0400

    Fold a few more entries into the 0.4.3.3-alpha changelog
---
 ChangeLog           | 15 +++++++++++++++
 changes/ticket33194 |  4 ----
 changes/ticket33195 |  4 ----
 changes/ticket33361 |  3 ---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7024b2b1e..461126330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,12 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
       value. This should make it easier to tell what's going wrong when
       a configuration file doesn't parse. Closes ticket 33460.
 
+  o Minor bugfix (relay, configuration):
+    - Warn if the ContactInfo field is not set, and tell the relay
+      operator that not having a ContactInfo field set might cause their
+      relay to get rejected in the future. Fixes bug 33361; bugfix
+      on 0.1.1.10-alpha.
+
   o Minor bugfixes (coding best practices checks):
     - Allow the "practracker" script to read unicode files when using
       Python 2. We made the script use unicode literals in 0.4.3.1-alpha,
@@ -41,6 +47,15 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
     - Document the __OwningControllerProcess torrc option and specify
       its polling interval. Resolves issue 32971.
 
+  o Testing (Travis CI):
+    - Remove a redundant distcheck job. Closes ticket 33194.
+    - Sort the Travis jobs in order of speed: putting the slowest jobs
+      first takes full advantage of Travis job concurrency. Closes
+      ticket 33194.
+    - Stop allowing the Chutney IPv6 Travis job to fail. This job was
+      previously configured to fast_finish (which requires
+      allow_failure), to speed up the build. Closes ticket 33195.
+
 
 Changes in version 0.4.3.2-alpha - 2020-02-10
   This is the second stable alpha release in the Tor 0.4.3.x series. It
diff --git a/changes/ticket33194 b/changes/ticket33194
deleted file mode 100644
index b87e55348..000000000
--- a/changes/ticket33194
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Testing:
-    - Remove a redundant distcheck job. Closes ticket 33194.
-    - Sort the Travis jobs in order of speed. Putting the slowest jobs first
-      takes full advantage of Travis job concurrency. Closes ticket 33194.
diff --git a/changes/ticket33195 b/changes/ticket33195
deleted file mode 100644
index 11abd4816..000000000
--- a/changes/ticket33195
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Testing:
-    - Stop allowing the Chutney IPv6 Travis job to fail. This job was
-      previously configured to fast_finish (which requires allow_failure), to
-      speed up the build. Closes ticket 33195.
diff --git a/changes/ticket33361 b/changes/ticket33361
deleted file mode 100644
index bc9715d6a..000000000
--- a/changes/ticket33361
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (relay, configuration):
-    - Now warn if the ContactInfo field is not set and mention that the relay
-      might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.