diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-02 14:29:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-02 14:29:37 -0400 |
| commit | e8386cce1ce41b667095cd9590567204d2ab0ba0 (patch) | |
| tree | f3611ab4fa9ca1de767f4dc8acee69debb0e5f78 /src | |
| parent | 0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb (diff) | |
| parent | a68e5323f809056cae9fcefc06357f9646595d89 (diff) | |
| download | tor-e8386cce1ce41b667095cd9590567204d2ab0ba0.tar.gz tor-e8386cce1ce41b667095cd9590567204d2ab0ba0.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/sandbox.c | 2 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c index a32bd0d901..cdb4521c82 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -129,11 +129,13 @@ static int filter_nopar_gen[] = { SCMP_SYS(clone), SCMP_SYS(epoll_create), SCMP_SYS(epoll_wait), + SCMP_SYS(eventfd2), SCMP_SYS(fcntl), SCMP_SYS(fstat), #ifdef __NR_fstat64 SCMP_SYS(fstat64), #endif + SCMP_SYS(futex), SCMP_SYS(getdents64), SCMP_SYS(getegid), #ifdef __NR_getegid32 diff --git a/src/or/main.c b/src/or/main.c index bbee8e0fb9..5fa3a01500 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3042,7 +3042,7 @@ sandbox_init_filter(void) // orport if (server_mode(get_options())) { - OPEN_DATADIR2_SUFFIX("keys", "secret_id_key", "tmp"); + OPEN_DATADIR2_SUFFIX("keys", "secret_id_key", ".tmp"); OPEN_DATADIR2_SUFFIX("keys", "secret_onion_key", ".tmp"); OPEN_DATADIR2_SUFFIX("keys", "secret_onion_key_ntor", ".tmp"); OPEN_DATADIR2("keys", "secret_id_key.old"); |