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

[nickm at torproject.org]

commit ced2dd5f92c910fb827bac2e70edfc6e5922b21a
Merge: 1c5a76f0c ad35e595e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 27 08:23:37 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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