commit 8fdb64a2edf9e354136085dc2ce38dbb60457716 Author: George Kadianakis desnacked@riseup.net Date: Thu May 8 17:42:14 2014 +0100

Don't set transport circuit to None when closing a circuit. --- ChangeLog | 2 ++ obfsproxy/network/network.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog index 6e62a75..35fea5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Changes in version 0.2.10 - UNRELEASED: + - Don't set the transport's circuit to None if we are closing + a circuit; it was causing problems in obfs3. Fixes #11820. - Make sure that we don't try to do networking operations on a connection that should be closed. Fixes #11769. - Only print ScrambleSuit disclaimer on startup (instead of diff --git a/obfsproxy/network/network.py b/obfsproxy/network/network.py index aadbba5..f346618 100644 --- a/obfsproxy/network/network.py +++ b/obfsproxy/network/network.py @@ -185,7 +185,6 @@ class Circuit(Protocol): self.upstream.close()

self.transport.circuitDestroyed(reason, side) - self.transport.circuit = None

class GenericProtocol(Protocol, object): """