commit 1dd0548d81e72175b866e208be29f91d1a39f84e Merge: 3b533bda2 aaa5ca366 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 8 09:26:23 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)