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

[nickm at torproject.org]

commit 8f8a061b0c4724adebb4af1d5ac3edb7381269d5
Merge: 6f3208670 10b242822
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 21 15:08:17 2017 -0400

    Merge branch 'maint-0.3.1'

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