start a changelog for 0.4.2.6

10 files changed, 51 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f78080783..9a4b0a6789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+Changes in version 0.4.2.6 - 2020-01-3x
+  This is the second stable release in the 0.4.2.x series.
+
+  o Major bugfixes (linux seccomp sandbox, backport from 0.4.3.1-alpha):
+    - Correct how we use libseccomp. Particularly, stop assuming that
+      rules are applied in a particular order or that more rules are
+      processed after the first match. Neither is the case! In
+      libseccomp <2.4.0 this lead to some rules having no effect.
+      libseccomp 2.4.0 changed how rules are generated, leading to a
+      different ordering, which in turn led to a fatal crash during
+      startup. Fixes bug 29819; bugfix on 0.2.5.1-alpha. Patch by
+      Peter Gerber.
+    - Fix crash when reloading logging configuration while the
+      experimental sandbox is enabled. Fixes bug 32841; bugfix on
+      0.4.1.7. Patch by Peter Gerber.
+
+  o Minor bugfixes (logging, crash, backport from 0.4.3.1-alpha):
+    - Avoid a possible crash when trying to log a (fatal) assertion
+      failure about mismatched magic numbers in configuration objects.
+      Fixes bug 32771; bugfix on 0.4.2.1-alpha.
+
+  o Minor bugfixes (windows service, backport from 0.4.3.1-alpha):
+    - Initialize the publish/subscribe system when running as a windows
+      service. Fixes bug 32778; bugfix on 0.4.1.1-alpha.
+
+  o Testing (backport from 0.4.3.1-alpha)
+    - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on
+      Ubuntu Bionic. Turning off the Sandbox is a work-around, until we
+      fix the sandbox errors in 32722. Closes ticket 32240.
+    - Re-enable the Travis CI macOS Chutney build, but don't let it
+      prevent the Travis job from finishing. (The Travis macOS jobs are
+      slow, so we don't want to have it delay the whole CI process.)
+      Closes ticket 32629.
+
+  o Testing (continuous integration, backport from 0.4.3.1-alpha):
+    - Use zstd in our Travis Linux builds. Closes ticket 32242.
+
+  o Minor bugfixes (testing, backport from 0.4.3.1-alpha):
+    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
+      test_practracker.sh script. Doing so caused a test failure. Fixes
+      bug 32705; bugfix on 0.4.2.1-alpha.
+    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when
+      skipping practracker checks. Fixes bug 32705; bugfix
+      on 0.4.2.1-alpha.
+
+  o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha):
+    - Use GCC/Clang's printf-checking feature to make sure that
+      tor_assertf() arguments are correctly typed. Fixes bug 32765;
+      bugfix on 0.4.1.1-alpha.
+
+
 Changes in version 0.4.2.5 - 2019-12-09
   This is the first stable release in the 0.4.2.x series. This series
   improves reliability and stability, and includes several stability and
diff --git a/changes/bug29819 b/changes/bug29819
deleted file mode 100644
index d37ac83d66..0000000000
--- a/changes/bug29819
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (linux seccomp sandbox):
-    - Correct how we use libseccomp. Particularly, stop assuming that
-      rules are applied in a particular order or that more rules are
-      processed after the first match. Neither is the case! In libseccomp
-      <2.4.0 this lead to some rules having no effect. Libseccomp 2.4.0
-      changed how rules are generated leading to a different ordering
-      which in turn lead to a fatal crash during startup. Fixes bug
-      29819; bugfix on 0.2.5.1-alpha. Patch by Peter Gerber.
diff --git a/changes/bug32771 b/changes/bug32771
deleted file mode 100644
index 606bcf4be4..0000000000
--- a/changes/bug32771
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (logging, crash):
-    - Avoid a possible crash when trying to log a (fatal) assertion failure
-      about mismatched magic numbers in configuration objects. Fixes bug 32771;
-      bugfix on 0.4.2.1-alpha.
diff --git a/changes/bug32778 b/changes/bug32778
deleted file mode 100644
index ccb6104692..0000000000
--- a/changes/bug32778
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (windows service):
-    - Initialize publish/subscribe system when running as a windows service.
-      Fixes bug 32778; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug32841 b/changes/bug32841
deleted file mode 100644
index 48568f6a61..0000000000
--- a/changes/bug32841
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (linux seccomp sandbox):
-    - Fix crash when reloading logging configuration while the
-      experimental sandbox is enabled. Fixes bug 32841; bugfix
-      on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/ticket32240 b/changes/ticket32240
deleted file mode 100644
index 35cc3df27e..0000000000
--- a/changes/ticket32240
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Testing:
-    - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu
-      Bionic. Turning off the Sandbox is a work-around, until we fix the
-      sandbox errors in 32722. Closes ticket 32240.
diff --git a/changes/ticket32242 b/changes/ticket32242
deleted file mode 100644
index d63d5a586e..0000000000
--- a/changes/ticket32242
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Testing (continuous integration):
-    - Use zstd in our Travis Linux builds. Closes ticket 32242.
diff --git a/changes/ticket32629 b/changes/ticket32629
deleted file mode 100644
index 740746c572..0000000000
--- a/changes/ticket32629
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Testing:
-    - Re-enable the Travis CI macOS Chutney build, but allow the job to finish
-      before it finishes, because the Travis macOS jobs are slow.
-      Closes ticket 32629.
diff --git a/changes/ticket32705_disable b/changes/ticket32705_disable
deleted file mode 100644
index 6d5b0779ab..0000000000
--- a/changes/ticket32705_disable
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (testing):
-    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
-      test_practracker.sh script.  Doing so caused a test failure.
-      Fixes bug 32705; bugfix on 0.4.2.1-alpha.
-    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr
-      when skipping practracker checks.
-      Fixes bug 32705; bugfix on 0.4.2.1-alpha.
diff --git a/changes/ticket32765 b/changes/ticket32765
deleted file mode 100644
index a9663a5df3..0000000000
--- a/changes/ticket32765
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (correctness checks):
-    - Use GCC/Clang's printf-checking feature to make sure that
-      tor_assertf() arguments are correctly typed. Fixes bug 32765;
-      bugfix on 0.4.1.1-alpha.