Commit 57c4af16 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents fbd2fef2 389b3724

changes/ticket31091

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/feature/client/transports.c

+2 −4
Original line number Diff line number Diff line
@@ -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