commit 9b37d540b05bf25de5ef82766d0228aee7979af0 Merge: 99683ee d6ca36d Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 7 10:52:21 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20710_025 | 4 ++++ src/common/sandbox.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)