commit ba9946dda702162f2fc7c35d79825604433eb0a9 Merge: 824bebd f0945ac Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 27 17:35:04 2014 -0400 Merge branch 'bug11622' changes/11622 | 3 +++ src/common/sandbox.c | 36 ++++++++++++++++++++++++++++++++++-- src/common/sandbox.h | 16 ---------------- 3 files changed, 37 insertions(+), 18 deletions(-)