commit ed6f2f61a260a08d9e8f315e4397335fa39383be parent 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Author: teor <teor@torproject.org> Date: Mon, 25 Nov 2019 12:35:58 +1000 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0 Diffstat:
| A | changes/ticket31091 | | | 3 | +++ |
| M | src/feature/client/transports.c | | | 6 | ++---- |
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/changes/ticket31091 b/changes/ticket31091 @@ -0,0 +1,3 @@ + o Minor bugfixes (pluggable transports): + - Remove overly strict assertions that triggers when a pluggable transport + is spawned in an unsuccessful manner. Fixes bug 31091; bugfix on 0.4.0.1-alpha. diff --git 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