commit 183d465f0e497cbc5f49c08119dfdf00eb7f8cdd Merge: 0b45cab 725e0c7 Author: Andrea Shepard andrea@torproject.org Date: Wed Mar 30 12:23:42 2016 +0000

Merge branch 'bug15221_027' into maint-0.2.7

changes/bug15221 | 4 ++++ src/common/sandbox.c | 9 +++++++++ 2 files changed, 13 insertions(+)