commit d37e8b407a762316e89e0c0a613c26372ec897aa Merge: f4f828640 a0bb1ff6a Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 24 09:23:43 2017 -0400

Merge branch 'feature22976_squashed'

changes/feature22976 | 8 +++++++ doc/tor.1.txt | 7 ++++++ src/common/sandbox.c | 63 ---------------------------------------------------- src/common/sandbox.h | 8 ------- src/common/util.c | 20 +++++++++++++++++ src/common/util.h | 2 ++ src/or/config.c | 24 ++++++++++++++++++++ src/or/main.c | 3 ++- src/or/or.h | 4 ++++ 9 files changed, 67 insertions(+), 72 deletions(-)