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

[nickm at torproject.org]

commit b5873fa7778bb3080f5bd38e34c8533da497362b
Merge: f4e033288 800797e7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 12:57:58 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

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