Merge remote-tracking branch 'public/bug11970'

diff --cc src/common/sandbox.c
Simple merge

diff --cc src/common/sandbox.h
Simple merge

diff --cc src/or/main.c
Simple merge