commit b488bd54ba2055dbc01f7e7cfeca0d5d2d3990da Merge: 831649f b9a43c8 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 13 11:25:59 2016 -0400

Merge remote-tracking branch 'public/bug20063'

changes/bug20063 | 6 ++++++ src/common/sandbox.c | 6 ++++++ 2 files changed, 12 insertions(+)