commit 4367cbd71b7a7b53e191b54a67ee6cbc00651024 Merge: 250b84b 506c890 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 16 23:45:55 2014 -0400
Merge remote-tracking branch 'public/sandbox_fixes_rebased_2'
changes/sandbox_fixes_11351 | 13 + configure.ac | 1 + src/common/compat.c | 14 +- src/common/compat.h | 1 + src/common/compat_libevent.c | 19 + src/common/compat_libevent.h | 2 + src/common/crypto.c | 1 + src/common/gen_linux_syscalls.pl | 37 ++ src/common/include.am | 1 + src/common/linux_syscalls.inc | 1153 ++++++++++++++++++++++++++++++++++++++ src/common/sandbox.c | 434 +++++++++----- src/common/sandbox.h | 65 +-- src/common/util.c | 2 + src/or/config.c | 68 ++- src/or/dns.c | 2 + src/or/main.c | 167 ++++-- src/or/statefile.c | 3 +- 17 files changed, 1742 insertions(+), 241 deletions(-)