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

[nickm at torproject.org]

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e
Merge: ce8e7427b 9727b4c5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:23:31 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24969     | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)