[Pkg-privacy-commits] [obfsproxy] 20/353: Merge branch 'master' of https://github.com/blanu/py-obfsproxy

[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 2c16b21df4682e16d2e9ce5653aa7d03ffa94cdf
Merge: ed92e4f e77cec2
Author: Brandon Wiley <brandon at blanu.net>
Date:   Wed Jul 18 12:33:52 2012 -0500

    Merge branch 'master' of https://github.com/blanu/py-obfsproxy

 src/{ => obfsproxy/crypto}/__init__.py     |  0
 src/obfsproxy/crypto/aes.py                | 29 +++++++++++++
 src/obfsproxy/framework/managed/client.py  | 18 +++++++--
 src/obfsproxy/transports/dummy.py          | 16 ++++----
 src/obfsproxy/transports/dust_transport.py | 63 +++++++++++++++++++++++++++++
 src/obfsproxy/transports/obfs3.py          | 65 ++++++++++++++++++++++++++++++
 src/obfsproxy/transports/rot13.py          | 15 +++----
 7 files changed, 184 insertions(+), 22 deletions(-)

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