nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
teor 2019-11-25 12:35:58 +10:00
commit ed6f2f61a2
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket31091 Normal file
View 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.

6
src/feature/client/transports.c
View File

@ -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