commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06 Merge: c9b76a12f b943cedf3 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

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