commit 129cee1c7511edd82dae77cf2946b147e4eed887 Merge: 41adfd6 d6ca36d Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 7 10:52:28 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20710_025 | 4 ++++ src/common/sandbox.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)