mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
This commit is contained in:
commit
ed6f2f61a2
3
changes/ticket31091
Normal file
3
changes/ticket31091
Normal file
@ -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.
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user