[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/234' into maint-0.4.5

[ahf at torproject.org]

commit 5a2d01ae57a2b90a03895fe33f07629089eee21a
Merge: b83777f7b2 ee6ad0e592
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Dec 16 20:38:23 2020 +0000

    Merge branch 'tor-gitlab/mr/234' into maint-0.4.5

 changes/ticket40106             |  5 +++++
 src/app/config/config.c         |  3 ++-
 src/feature/client/transports.c | 22 ++++++++++++++++++++++
 src/feature/client/transports.h |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)