commit 8b0b850efa0f77b627f31e9907acc6d29482f362 Merge: a846fd267 9a0628254 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 15:51:58 2018 -0500

Merge remote-tracking branch 'public/bug16106_02_nm'

changes/bug16106 | 6 ++++++ src/common/sandbox.c | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-)