[Pkg-privacy-commits] [obfsproxy] 197/353: Add ChangeLog entry for #9815.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 1212dba2d60a661c2ff49bf40f9cf4ca93e6ae75
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Sep 26 23:56:44 2013 +0100

    Add ChangeLog entry for #9815.
    
    (And specify the name of an optional argument in a function call.)
---
 ChangeLog                   | 5 +++++
 obfsproxy/managed/server.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0541fcc..37efa5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.4 - UNRELEASED
+ - Make pluggable transports aware of where they should store state
+   in the filesystem. Also introduce --data-dir CLI switch to specify
+   the path in external mode. Fixes #9815. Patch by Philipp Winter.
+
 Changes in version 0.2.3 - 2013-09-11
  - Use the new pyptlib API (>= pyptlib-0.0.4). Patch by Ximin Luo.
  - Add support for sending the pluggable transport name to Tor (using
diff --git a/obfsproxy/managed/server.py b/obfsproxy/managed/server.py
index 3f760a8..54f9b26 100644
--- a/obfsproxy/managed/server.py
+++ b/obfsproxy/managed/server.py
@@ -45,7 +45,7 @@ def do_managed_server():
                                                                       'ext_server',
                                                                       ext_orport,
                                                                       pt_config,
-                                                                      authcookie)
+                                                                      ext_or_cookie_file=authcookie)
             else:
                 addrport = launch_transport.launch_transport_listener(transport,
                                                                       transport_bindaddr,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git