sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2017-12-12 19:46:53 -05:00
parent dc9f2cdf73 15b41fa6ae
commit 37fba82c15
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug24424 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (portability):
- Tor now compiles correctly on arm64 with libseccomp-dev installed.
(It doesn't yet work with the sandbox enabled.) Closes ticket 24424.

5
src/common/sandbox.c
View File

@ -106,6 +106,11 @@
#define M_SYSCALL arm_r7
#elif defined(__aarch64__) && defined(__LP64__)
#define REG_SYSCALL 8
#define M_SYSCALL regs[REG_SYSCALL]
#endif /* defined(__i386__) || ... */
/**Determines if at least one sandbox is active.*/