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

[nickm at torproject.org]

commit 7c97a87ddb0e40895aad432dd44b0f91160f5e3a
Merge: d5f0cbce9 27a2a6cb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 09:26:22 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug25440     | 5 +++++
 src/common/sandbox.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)