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

[nickm at torproject.org]

commit 71c701927a27723f0bc9009a044a4bdece55f361
Merge: 493d9cd 1c64133
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 19 13:52:19 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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