diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-18 12:27:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-18 12:27:49 -0400 |
| commit | 7c5716d162f2109f246fbd369185c973dd60b22b (patch) | |
| tree | 3b44aff096b7fa1910e827f4f42538cf4e00e2cd /src | |
| parent | e2a42a1ab0bbea00e24718f0ff3b9c6538aaa802 (diff) | |
| parent | 57c4af16f0d9e80c0adaaada61609497723f6184 (diff) | |
| download | tor-7c5716d162f2109f246fbd369185c973dd60b22b.tar.gz tor-7c5716d162f2109f246fbd369185c973dd60b22b.zip | |
Merge branch 'maint-0.4.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/client/transports.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 97bfc8ae30..3f731ac7d4 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1826,15 +1826,13 @@ managed_proxy_stdout_callback(process_t *process, managed_proxy_t *mp = process_get_data(process); - if (BUG(mp == NULL)) + if (mp == NULL) return; handle_proxy_line(line, mp); - if (proxy_configuration_finished(mp)) { + if (proxy_configuration_finished(mp)) handle_finished_proxy(mp); - tor_assert(mp->conf_state == PT_PROTO_COMPLETED); - } } /** Callback function that is called when our PT process have data on its |