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 | 77188ef36e9163b87f89135ff459f21100614b1e (patch) | |
| tree | ddf94718f01d4845a23ad4024d2ce32d46a64fc4 | |
| parent | 7b7aa4f070565fda111991f0d49342c977e42f02 (diff) | |
| parent | 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 (diff) | |
| download | tor-77188ef36e9163b87f89135ff459f21100614b1e.tar.gz tor-77188ef36e9163b87f89135ff459f21100614b1e.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -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. |