diff options
| author | George Kadianakis <desnacked@riseup.net> | 2013-10-29 22:49:37 +0000 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2013-10-29 22:49:37 +0000 |
| commit | 9e0ed8136a53665a21ecdf2bc335cc8ce438e0c8 (patch) | |
| tree | 921b08e77625c313588dfa18103051ddee138eaf | |
| parent | 4b6f074df9c540cb4847793b7e8243c8f642de0a (diff) | |
| download | tor-9e0ed8136a53665a21ecdf2bc335cc8ce438e0c8.tar.gz tor-9e0ed8136a53665a21ecdf2bc335cc8ce438e0c8.zip | |
Fix an always-true assert in PT code.
| -rw-r--r-- | changes/bug10046 | 3 | ||||
| -rw-r--r-- | src/or/transports.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug10046 b/changes/bug10046 new file mode 100644 index 0000000000..b2f545efe9 --- /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 f9499eb6d8..8b4a11882b 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) { |