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

[nickm at torproject.org]

commit 33606405e3070de6517690b1494f16c04524ce72
Merge: eacfd2911 b5a6c0399
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 10:29:29 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/feature25313 |  4 ++++
 src/common/sandbox.c | 23 ++---------------------
 2 files changed, 6 insertions(+), 21 deletions(-)