[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 649ca08dd9f36b6d71034203a1fe8b57629a1665
Merge: d041f083c8 5a2d01ae57
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Dec 16 20:39:01 2020 +0000

    Merge branch 'maint-0.4.5' into release-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(-)