Fix an always-true assert in PT code.

diff --git a/changes/bug10046 b/changes/bug10046
new file mode 100644 (file)
index 0000000..b2f545e
--- /dev/null
+++ b/changes/bug10046
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Fix an always-true assertion in pluggable transports code. Fixes
+      issue 10046. Found by dcb.

diff --git a/src/or/transports.c b/src/or/transports.c
index f9499eb6d840fc31cef598446a46a1c64b7255b8..8b4a11882be5b5b5773b59948155feaad31f7a48 100644 (file)
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -552,7 +552,7 @@ pt_configure_remaining_proxies(void)
   assert_unconfigured_count_ok();
 
   SMARTLIST_FOREACH_BEGIN(tmp,  managed_proxy_t *, mp) {
-    tor_assert(mp->conf_state != PT_PROTO_BROKEN ||
+    tor_assert(mp->conf_state != PT_PROTO_BROKEN &&
                mp->conf_state != PT_PROTO_FAILED_LAUNCH);
 
     if (mp->got_hup) {