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

[nickm at torproject.org]

commit eff5e29404980a87b4618e8623c35a363af6cc04
Merge: 5641e27 71c7019
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 19 13:52:19 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22516     | 5 +++++
 src/common/sandbox.c | 3 +++
 2 files changed, 8 insertions(+)