commit 35025ee51ff9204271fcfc787a99334082e531a1 Merge: 03fdf23 d792d2a Author: Nick Mathewson nickm@torproject.org Date: Mon May 8 13:40:41 2017 -0400

Merge branch 'maint-0.3.0'

changes/bug21943 | 6 ++++++ src/common/sandbox.c | 1 + 2 files changed, 7 insertions(+)