commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48 Merge: ab415ae95 800797e7f Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23291 | 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)