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

[nickm at torproject.org]

commit 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e
Merge: f0230ee38 5c3639923
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:23:31 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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