[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit b2c4d4e7fae3dda864282953c05ab3b9b0f1b22d
Merge: 8939eaf47 84c13336c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 11 18:11:04 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1

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