[tor-commits] [tor/master] Merge branch 'tor-github/pr/1793' into maint-0.3.5

[ahf at torproject.org]

commit 8444fbe904141d7954efe221b663efee1774df41
Merge: c3ad2a1d2 8dc7ad127
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 13:55:39 2020 +0000

    Merge branch 'tor-github/pr/1793' into maint-0.3.5

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