commit 84c13336c410ac218c70d6ce2ce6216f9b24e796 Merge: 848ba26c1 7461cd306 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 18:10:59 2018 -0500

Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9

changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)