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

[nickm at torproject.org]

commit 78988f151d7706632a4b1e453667e35cc85c4b39
Merge: 486ac94 1c64133
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 19 13:52:19 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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