diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:39:01 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:39:01 +0000 |
| commit | 66597b9291eb95203c0d84fb38f9a9561b4c8d85 (patch) | |
| tree | 099e93db720816c988bcbcc1fbd68442cb7e3382 /src/app | |
| parent | 66b1a9a5c101d071c88a4f6786dbed9ad4e94982 (diff) | |
| parent | 5a2d01ae57a2b90a03895fe33f07629089eee21a (diff) | |
| download | tor-66597b9291eb95203c0d84fb38f9a9561b4c8d85.tar.gz tor-66597b9291eb95203c0d84fb38f9a9561b4c8d85.zip | |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 100c08286a..bf2f49ead4 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2198,7 +2198,8 @@ options_act,(const or_options_t *old_options)) * validation time. */ SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) { const char *bi_transport_name = bridget_get_transport_name(bi); - if (bi_transport_name && !transport_get_by_name(bi_transport_name)) { + if (bi_transport_name && (!transport_get_by_name(bi_transport_name) && + !managed_proxy_has_transport(bi_transport_name))) { log_warn(LD_CONFIG, "Bridge line with transport %s is missing a " "ClientTransportPlugin line", bi_transport_name); return -1; |