[Pkg-privacy-commits] [obfsproxy] 183/353: Merge remote-tracking branch 'ximin/pyptlib-api'

[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 f2afac999fd8b7de765dd3d50dce1eaedaefcf95
Merge: 8f1f43a c5135c9
Author: root <root at b>
Date:   Tue Sep 10 23:49:35 2013 +0300

    Merge remote-tracking branch 'ximin/pyptlib-api'

 obfsproxy/managed/client.py | 17 +++++++++--------
 obfsproxy/managed/server.py | 28 ++++++++++++++++------------
 obfsproxy/pyobfsproxy.py    |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)


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