commit fdd13697d537bc699253a2bc53cc31ce5473eca4 Merge: 4fc402496 acc462c96 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:43:51 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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