Browse Source

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

Nick Mathewson 4 years ago
parent
commit
57c4af16f0
2 changed files with 5 additions and 4 deletions
  1. 3 0
      changes/ticket31091
  2. 2 4
      src/feature/client/transports.c

+ 3 - 0
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.

+ 2 - 4
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