diff options
| author | teor <teor@torproject.org> | 2019-11-05 14:23:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-05 14:23:10 +1000 |
| commit | 61694695469824f5daf5155d5f072dd97be22c32 (patch) | |
| tree | 6d09e71c4ca8f3db5914d5e6b1ec3e37e3e62f95 /src/feature/client | |
| parent | d3af23783c35151a511fc7fc37d88cf41831448c (diff) | |
| parent | bcb38d984d42a75832db9fc8f3b70d54dce472e4 (diff) | |
| download | tor-61694695469824f5daf5155d5f072dd97be22c32.tar.gz tor-61694695469824f5daf5155d5f072dd97be22c32.zip | |
Merge remote-tracking branch 'tor-github/pr/1477'
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/transports.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 3f731ac7d4..6537a4b2da 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -97,6 +97,8 @@ #include "core/or/circuitbuild.h" #include "feature/client/transports.h" #include "feature/relay/router.h" +/* 31851: split the server transport code out of the client module */ +#include "feature/relay/transport_config.h" #include "app/config/statefile.h" #include "core/or/connection_or.h" #include "feature/relay/ext_orport.h" @@ -1279,7 +1281,7 @@ get_transport_options_for_server_proxy(const managed_proxy_t *mp) string. */ SMARTLIST_FOREACH_BEGIN(mp->transports_to_launch, const char *, transport) { smartlist_t *options_tmp_sl = NULL; - options_tmp_sl = get_options_for_server_transport(transport); + options_tmp_sl = pt_get_options_for_server_transport(transport); if (!options_tmp_sl) continue; |