diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:08:59 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:08:59 -0500 |
commit | bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d (patch) | |
tree | f541cf6ba27709e80c00bb58e73f71689c908bd9 | |
parent | 8b685622f843d1d450bf87356aa7055964421dd4 (diff) | |
parent | f5461a4bdf343a0572b0594fa33af37ce1be9d8f (diff) | |
download | tor-bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d.tar.gz tor-bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d.zip |
Merge branch 'maint-0.4.1' into release-0.4.1
-rw-r--r-- | changes/bug32841 | 4 | ||||
-rw-r--r-- | changes/bug32877 | 4 |
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. |