[tor-commits] [tor/release-0.4.3] Fold new items into 0.4.3.3-alpha changelog.

[nickm at torproject.org]

commit 4d1d8bde955cc0c1c42dcb0073954893323735ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 14:22:36 2020 -0400

    Fold new items into 0.4.3.3-alpha changelog.
---
 ChangeLog              | 19 +++++++++++++++++++
 changes/ticket32672    |  4 ----
 changes/ticket32792    |  3 ---
 changes/ticket33619    |  5 -----
 changes/trove_2020_003 |  4 ----
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 461126330..03778422f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 Changes in version 0.4.3.3-alpha - 2020-03-??
   blurb here.
 
+  o Major bugfixes (circuit padding, memory leak):
+    - Avoid a remotely triggered memory leak in the case that a circuit
+      padding machine is somehow negotiated twice on the same circuit.
+      Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls.
+      This is also tracked as TROVE-2020-004.
+
   o Major bugfixes (directory authority):
     - Directory authorities will now send a 503 (not enough bandwidth)
       code to clients when under bandwidth pressure. Known relays and
@@ -12,6 +18,11 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
       track down possible causes of a rare crash (32564) in the EWMA
       code. Closes ticket 33290.
 
+  o Minor features (directory authorities):
+    - Directory authorities now reject descriptors from relays running
+      Tor versions from the 0.2.9 and 0.4.0 series. The 0.3.5 series is
+      still allowed. Resolves ticket 32672. Patch by Neel Chauhan.
+
   o Minor features (usability):
     - Include more information when failing to parse a configuration
       value. This should make it easier to tell what's going wrong when
@@ -33,6 +44,12 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
     - Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix
       on 0.3.2.2-alpha.
 
+  o Minor bugfixes (hidden services v3):
+    - Fix an assertion failure that could result from a corrupted
+      ADD_ONION control port command. Found by Saibato. Fixes bug 33137;
+      bugfix on 0.3.3.1-alpha. This issue is also tracked
+      as TROVE-2020-003.
+
   o Minor bugfixes (onion service v3, client):
     - Remove a BUG() warning that would cause a stack trace if an onion
       service descriptor was freed while we were waiting for a
@@ -55,6 +72,8 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
     - 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.
+    - When a Travis chutney job fails, use chutney's new "diagnostics.sh"
+      tool to produce detailed diagnostic output. Closes ticket 32792.
 
 
 Changes in version 0.4.3.2-alpha - 2020-02-10
diff --git a/changes/ticket32672 b/changes/ticket32672
deleted file mode 100644
index 351329ba2..000000000
--- a/changes/ticket32672
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (directory authorities):
-    - Directory authorities now reject descriptors from relays running Tor
-      versions from the 0.2.9 and 0.4.0 series, but still allow the 0.3.5
-      series. Resolves ticket 32672. Patch by Neel Chauhan.
diff --git a/changes/ticket32792 b/changes/ticket32792
deleted file mode 100644
index 553cf0ca8..000000000
--- a/changes/ticket32792
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
-      to produce detailed diagnostic output. Closes ticket 32792.
diff --git a/changes/ticket33619 b/changes/ticket33619
deleted file mode 100644
index 3c52858b3..000000000
--- a/changes/ticket33619
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (circuit padding, memory leaks):
-    - Avoid a remotely triggered memory leak in the case that a circuit
-      padding machine is somehow negotiated twice on the same circuit. Fixes
-      bug 33619; bugfix on 0.4.0.1-alpha.  Found by Tobias Pulls.  This is
-      also tracked as TROVE-2020-004.
diff --git a/changes/trove_2020_003 b/changes/trove_2020_003
deleted file mode 100644
index aa1a8f1c7..000000000
--- a/changes/trove_2020_003
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (onion services v3):
-  - Fix assertion failure that could result from a corrupted ADD_ONION control
-    port command. Found by Saibato. Fixes bug 33137; bugfix on
-    0.3.3.1-alpha. This issue is also being tracked as TROVE-2020-003.