commit 1c64133cb3b9656fc37c1d8c91e1b4225f889428 Merge: cd7d006 59f2997 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 19 13:50:49 2017 -0400

Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9

changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+)