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

[nickm at torproject.org]

commit dbb9ec494f61bb994a310f5cef849e0fdde30efd
Merge: 97c3fac6d 543fd89fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 12:57:58 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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