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

[nickm at torproject.org]

commit 9727b4c5d683173888b5a49e8b24c3faa9045521
Merge: d3ff12630 c4be6dfea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:23:25 2018 -0400

    Merge branch 'bug24969_029_v2' into maint-0.2.9

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