commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f Merge: f17f7a4fd 16d2bce89 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 27 08:23:34 2017 -0400

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

changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)