commit 418d8bbe92bf31861ad2aaf787f00d20c7179c1e Merge: 057139d38 35d56a127 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:25:04 2017 -0500

Merge branch 'stack_fixes_032_v2' into maint-0.3.2

changes/stack | 7 +++++++ src/common/sandbox.c | 25 ------------------------- src/or/rephist.c | 4 +++- src/or/transports.c | 4 ---- 4 files changed, 10 insertions(+), 30 deletions(-)