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

[nickm at torproject.org]

commit 4012daacd12f8c3ab29250d6a004ede6b360faec
Merge: 401052548 00536254b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 09:26:23 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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