Unverified Commit ed6f2f61 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0

parents 329aa1c4 389b3724
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.
...@@ -1826,15 +1826,13 @@ managed_proxy_stdout_callback(process_t *process, ...@@ -1826,15 +1826,13 @@ managed_proxy_stdout_callback(process_t *process,
managed_proxy_t *mp = process_get_data(process); managed_proxy_t *mp = process_get_data(process);
if (BUG(mp == NULL)) if (mp == NULL)
return; return;
handle_proxy_line(line, mp); handle_proxy_line(line, mp);
if (proxy_configuration_finished(mp)) { if (proxy_configuration_finished(mp))
handle_finished_proxy(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 /** Callback function that is called when our PT process have data on its
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment