[Pkg-privacy-commits] [obfsproxy] 89/353: Merge remote-tracking branch 'remotes/sysrqb/bug7325-3'

[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 d87146efe8fda9bfe613de54b12f26ed32d207c3
Merge: eeef3e8 e666888
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Nov 28 00:52:40 2012 +0200

    Merge remote-tracking branch 'remotes/sysrqb/bug7325-3'

 obfsproxy.py                  |  15 +++--
 obfsproxy/common/heartbeat.py |   4 +-
 obfsproxy/common/log.py       | 125 +++++++++++++++++++++++++++++++-----------
 obfsproxy/managed/client.py   |   6 +-
 obfsproxy/managed/server.py   |   6 +-
 obfsproxy/network/network.py  |   6 +-
 obfsproxy/network/socks.py    |   4 +-
 obfsproxy/transports/b64.py   |   4 +-
 obfsproxy/transports/base.py  |   5 +-
 obfsproxy/transports/obfs2.py |   4 +-
 10 files changed, 129 insertions(+), 50 deletions(-)


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