commit d6ca36defa25e0d77718731924195cc244a18b11 Merge: 30f0516 045a50e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 7 10:52:12 2016 -0500 Merge branch 'bug20710_025' into maint-0.2.9 changes/bug20710_025 | 4 ++++ src/common/sandbox.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)