[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 21da46f697dd0c5a21536e69986867c7dfff2b7c
Merge: 920a7b37a 8e68fe7e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 09:26:23 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25440     | 5 +++++
 src/common/sandbox.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)