[Pkg-privacy-commits] [obfsproxy] 206/353: Merge remote-tracking branch 'remotes/david/david-transport-setup'

[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 92f2356d4f71a3b160fd91c1af5fb05fd7e24623
Merge: aae5f61 5679a30
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Nov 13 15:24:43 2013 +0000

    Merge remote-tracking branch 'remotes/david/david-transport-setup'

 obfsproxy/managed/client.py   | 10 +++++++---
 obfsproxy/managed/server.py   | 11 ++++++++---
 obfsproxy/pyobfsproxy.py      |  7 +++++++
 obfsproxy/transports/base.py  | 12 ++++++++++++
 obfsproxy/transports/obfs2.py | 16 ++++++++++------
 5 files changed, 44 insertions(+), 12 deletions(-)

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