commit fea5c8a015548f54e3ef1d3de67e7a82f916c213 Merge: 16bdb9e36 543fd89fb Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

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