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

[nickm at torproject.org]

commit 0df22e8f5f5c4e1a329f2930f6eb9ecde1cf9848
Merge: 5ff0b51 1cdad97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 13:40:14 2017 -0400

    Merge branch 'bug21943_029' into maint-0.2.9

 changes/bug21943     | 6 ++++++
 src/common/sandbox.c | 1 +
 2 files changed, 7 insertions(+)