commit 86fdddccb27f15edcfd49038c87a0f66c11fb52e Merge: 9cefc4723 2aa5e95f5 Author: George Kadianakis desnacked@riseup.net Date: Tue Jul 7 15:34:14 2020 +0300

Merge branch 'tor-github/pr/1973'

src/test/test-memwipe.c | 23 +++++++++++++++-------- src/test/test_config.c | 2 ++ 2 files changed, 17 insertions(+), 8 deletions(-)