commit 1a194beb2c01999e08010b44c279cbaaeeadf86c Merge: a56b9501f 6c966b894 Author: teor teor@torproject.org Date: Wed Feb 27 09:37:50 2019 +1000

Merge branch 'maint-0.3.3' into maint-0.3.4

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