commit aaa5ca366e83795f3ec7b35e879a3c8bc4e0b41f Merge: de129e69b 00536254b Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 8 09:26:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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