commit cb42f93a923ddf7455d7553e63abcf320bd2a00b Merge: 27c30bc22 84c13336c Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 18:11:04 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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