commit 3ecfb68bd72a6842dd11709e30590271f70ae69f Merge: b83d46feb 6c966b894 Author: teor teor@torproject.org Date: Wed Feb 27 09:37:43 2019 +1000

Merge branch 'maint-0.3.3' into release-0.3.3

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