commit 15dc33849eda4fba651bf4096a9e405d737a977b Merge: 1216f9953 1a194beb2 Author: teor teor@torproject.org Date: Wed Feb 27 09:38:04 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5

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