commit 6ce2550468b3ffdbe1c3bbbdaff39d8382622336 Merge: ad4a68bf35 ea52705e4b Author: Alexander Færøy <ahf@torproject.org> Date: Thu Nov 19 17:41:05 2020 +0000 Merge branch 'maint-0.4.5' changes/ticket25528 | 6 ++++++ src/app/config/config.c | 16 ++++++++++++++++ src/feature/client/bridges.c | 11 +++++++++++ src/feature/client/bridges.h | 1 + 4 files changed, 34 insertions(+)