[tor-commits] [tor/maint-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5

[nickm@xxxxxxxxxxxxxx]

commit 97b61e21a9a713ecd672ff106428286238ae05e4
Merge: 5f009a59da e0a8454691
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 17 09:09:42 2021 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5

 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(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits