summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-01-06 08:08:59 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-06 08:08:59 -0500
commit2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 (patch)
treec06c5f64472eaa78b9866ea369477358005c2e01
parent16e94dc7a70e90fe7a1617ffeef817f3394fe382 (diff)
parentf5461a4bdf343a0572b0594fa33af37ce1be9d8f (diff)
downloadtor-2d8d6d1ebfd62ebc6da931170d949d8c02f67b76.tar.gz
tor-2d8d6d1ebfd62ebc6da931170d949d8c02f67b76.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
-rw-r--r--changes/bug328414
-rw-r--r--changes/bug328774
2 files changed, 4 insertions, 4 deletions
diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0000000000..48568f6a61
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+ 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/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af708..0000000000
--- a/changes/bug32877
+++ /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 29150; bugfix
- on 0.4.1.7. Patch by Peter Gerber.