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

[nickm at torproject.org]

commit ad35e595e5070b16ad034315b5082d734f71f181
Merge: 7021d33b9 24ddf5862
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 27 08:23:36 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug20247     | 4 ++++
 src/common/sandbox.c | 8 ++++++++
 2 files changed, 12 insertions(+)