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

[nickm at torproject.org]

commit 2243fc3ad1bb33ca5f4a37952bb474d8314d5325
Merge: 8a27860720 71fd30b75a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 21 13:19:49 2021 -0500

    Merge branch 'maint-0.4.5'

 changes/ticket40106             |  9 +++++----
 src/app/config/config.c         | 17 -----------------
 src/feature/client/bridges.c    | 20 ++++++++++++++++++++
 src/feature/client/bridges.h    |  1 +
 src/feature/client/entrynodes.c |  3 +++
 5 files changed, 29 insertions(+), 21 deletions(-)