Merge branch 'maint-0.4.2'

This commit is contained in:
Nick Mathewson 2020-01-06 08:08:59 -05:00
commit 13216f848a
2 changed files with 5 additions and 0 deletions

4
changes/bug32841 Normal file
View File

@ -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.

View File

@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
SCMP_SYS(clock_gettime),
SCMP_SYS(close),
SCMP_SYS(clone),
SCMP_SYS(dup),
SCMP_SYS(epoll_create),
SCMP_SYS(epoll_wait),
#ifdef __NR_epoll_pwait