[tor-commits] [tor/master] Merge branch 'bug23291_028' into maint-0.3.1

[nickm at torproject.org]

commit 10b242822490c9873138565bcc8a3565a7dc7014
Merge: 6be0e2867 b943cedf3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 21 15:06:39 2017 -0400

    Merge branch 'bug23291_028' into maint-0.3.1

 changes/bug23291        | 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)