commit 9e0ed8136a53665a21ecdf2bc335cc8ce438e0c8 Author: George Kadianakis desnacked@riseup.net Date: Tue Oct 29 22:49:37 2013 +0000

Fix an always-true assert in PT code. --- changes/bug10046 | 3 +++ src/or/transports.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug10046 b/changes/bug10046 new file mode 100644 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 f9499eb..8b4a118 100644 --- 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) {