commit 6a930b442c986af11a438dd25f3fd5002ec3879e Merge: 635c59d55 1a194beb2 Author: teor teor@torproject.org Date: Wed Feb 27 09:37:57 2019 +1000

Merge branch 'maint-0.3.4' into release-0.3.4

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