[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm at torproject.org]

commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb
Merge: 4856a6e6c 27a2a6cb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 09:26:22 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug25440     | 5 +++++
 src/common/sandbox.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)