commit 397fc7a1682a8d3a57998fa95aba60ad3d87fd15 Merge: 906d1b24f0 71fd30b75a Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 21 13:19:39 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40106 | 6 ++++++ 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, 30 insertions(+), 17 deletions(-)