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

[nickm at torproject.org]

commit 732855c2e533fbab7c9087bf251e38b07bd27af2
Merge: 57d33b578 35257a1c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 26 07:27:50 2019 -0500

    Merge branch 'maint-0.4.0'

 changes/bug13221        | 5 +++++
 src/app/config/config.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)