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

commit 97b61e21a9a713ecd672ff106428286238ae05e4 Merge: 5f009a59da e0a8454691 Author: Nick Mathewson 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 + sr

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/387'

commit 11ac256a4413dbf89e02227e30b040c50d14652e Merge: af560f21ec e0a8454691 Author: Nick Mathewson Date: Mon May 17 09:08:49 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/387' ___ tor-commits mailing list tor-commits@lists.torproject.or