commit 2a0865898552bd5ededf7338761b5d428c7073d1 Merge: 0945235ff 9f93bcd16 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 26 10:29:29 2018 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)