[tor-commits] [tor/master] Merge branch 'bug15221_027'

[nickm at torproject.org]

commit 4b02af452d12b35e58d3a8e5e7ef042970e26774
Merge: 36ad65a 725e0c7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 14 14:10:47 2016 -0400

    Merge branch 'bug15221_027'

 changes/bug15221     | 4 ++++
 src/common/sandbox.c | 9 +++++++++
 2 files changed, 13 insertions(+)