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

[nickm at torproject.org]

commit a49521bd0cb64d4090a47766d7ad50c7866589f0
Merge: c84c5cc 0df22e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 13:40:22 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug21943     | 6 ++++++
 src/common/sandbox.c | 1 +
 2 files changed, 7 insertions(+)