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

[nickm at torproject.org]

commit 882dd4de0b5dd13674ff4530af0c8c43b389ff33
Merge: 9944fd92c 10b242822
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 21 15:08:17 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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