[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit f70929347f084b805fca35107d9f48b4b17b3b33
Merge: 17e29bda5 4bc55ed5e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:49:24 2019 -0500

    Merge branch 'maint-0.4.0'

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