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

[nickm at torproject.org]

commit 00536254b765900127af04f278ed591d562434d9
Merge: 2a6c1585b 8e68fe7e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 09:26:23 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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