[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 7372315d5690ec806cdd4eeacd8e41b0f2eeb689
Merge: a6cf5f6 d792d2a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 13:40:34 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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