commit ec49580a74a938ccbe171efd33efde5eec3039bc Merge: 935ac7107 4417ac880 Author: teor teor@torproject.org Date: Wed Feb 27 09:37:27 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

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