[tor-commits] [obfsproxy/master] Print ScrambleSuit disclaimer on startup.

[asn at torproject.org]

commit 0005192c52863f45c36709722cb3c7f237f9c375
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue May 6 14:15:15 2014 +0100

    Print ScrambleSuit disclaimer on startup.
    
    instead of printing it for every new connection
---
 ChangeLog                                         |    4 ++++
 obfsproxy/transports/scramblesuit/scramblesuit.py |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 05cc725..469988e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Changes in version 0.2.10 - UNRELEASED:
+ - Only print ScrambleSuit disclaimer on startup (instead of
+   printing it for every connection). Fixes #11768.
+
 Changes in version 0.2.9 - 2014-05-01:
  - Support connecting over a HTTPS CONNECT proxy.  Patch by Yawning Angel.
    Fixes #11409.
diff --git a/obfsproxy/transports/scramblesuit/scramblesuit.py b/obfsproxy/transports/scramblesuit/scramblesuit.py
index 9262b34..6279925 100644
--- a/obfsproxy/transports/scramblesuit/scramblesuit.py
+++ b/obfsproxy/transports/scramblesuit/scramblesuit.py
@@ -45,10 +45,6 @@ class ScrambleSuitTransport( base.BaseTransport ):
         Initialise a ScrambleSuitTransport object.
         """
 
-        log.error("\n\n################################################\n"
-                  "Do NOT rely on ScrambleSuit for strong security!\n"
-                  "################################################\n")
-
         log.debug("Initialising %s." % const.TRANSPORT_NAME)
 
         super(ScrambleSuitTransport, self).__init__()
@@ -106,6 +102,10 @@ class ScrambleSuitTransport( base.BaseTransport ):
         Called once when obfsproxy starts.
         """
 
+        log.error("\n\n################################################\n"
+                  "Do NOT rely on ScrambleSuit for strong security!\n"
+                  "################################################\n")
+
         util.setStateLocation(transportConfig.getStateLocation())
 
         cls.weAreClient = transportConfig.weAreClient