[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

[asn at torproject.org]

commit 8c77a9444afbc9944b15d94e388fd126c2a9b9ed
Merge: d13db36d8 00acccac6
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jun 26 10:51:50 2019 +0300

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug30894           | 4 ++++
 src/app/config/confparse.c | 1 +
 2 files changed, 5 insertions(+)