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

[ahf at torproject.org]

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 14:03:04 2020 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.2

 changes/ticket33361     |  3 +++
 src/app/config/config.c | 13 +++++++++----
 src/test/test_options.c | 19 ++++++++++++-------
 3 files changed, 24 insertions(+), 11 deletions(-)