commit 60c2e4b852095872897315c9b9876d8a7a53534c Merge: 338ebb382 15dc33849 Author: teor teor@torproject.org Date: Wed Feb 27 09:38:12 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

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