[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

[nickm at torproject.org]

commit debede5e501667bc20666e3c2f5d62d7bc888c8b
Merge: fbd47a5078 97b61e21a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 17 09:09:49 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/bug40317        |  5 +++++
 src/app/config/config.c | 17 +++++++++--------
 src/app/config/config.h |  3 +++
 src/app/main/main.c     | 22 +++++++++++++++++-----
 4 files changed, 34 insertions(+), 13 deletions(-)