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

[nickm at torproject.org]

commit 32948ebc5484d766cbf6f561ed41665e5f2fc192
Merge: a3139c9 eff5e29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 19 13:52:19 2017 -0400

    Merge branch 'maint-0.3.1'

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