commit 9390e2bf833ea1e7ef0354744b8497a5bed270d0 Merge: 7b102d53e3 7692f443d4 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 21 13:10:16 2021 -0500

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

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