[Pkg-privacy-commits] [obfsproxy] 146/353: Merge tag 'upstream/0.2.1'

[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 b6d90e68ba20487ff1ef8a482e939c2a9e2803cd
Merge: 78c5f05 c0a81b8
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Apr 8 19:54:17 2013 +0000

    Merge tag 'upstream/0.2.1'
    
    Upstream version 0.2.1
    
    Conflicts:
    	PKG-INFO
    	obfsproxy/_version.py

 ChangeLog                                    |  13 +
 LICENSE                                      | 197 +++++++
 PKG-INFO                                     |   4 +-
 bin/obfsproxy                                |  26 +
 bin/pyobfsproxy                              |  10 -
 doc/licenses/LICENSE.PYTHON                  | 773 +++++++++++++++++++++++++++
 obfsproxy/_version.py                        |   4 +-
 obfsproxy/common/log.py                      |  12 +-
 obfsproxy/network/socks.py                   |  38 ++
 obfsproxy/pyobfsproxy.py                     |  19 +-
 obfsproxy/test/int_tests/obfsproxy_tester.py |   2 +-
 obfsproxy/test/int_tests/pits.py             |   6 +-
 obfsproxy/test/int_tests/pits_transcript.py  |   4 +-
 obfsproxy/test/int_tests/test_pits.py        |  22 +
 obfsproxy/test/test_socks.py                 |  18 +
 obfsproxy/test/tester.py                     |  19 +-
 obfsproxy/transports/base.py                 |  10 +-
 obfsproxy/transports/obfs2.py                | 103 +++-
 obfsproxy/transports/transports.py           |   8 +-
 setup.py                                     |   8 +-
 setup_py2exe.py                              |  21 +
 21 files changed, 1266 insertions(+), 51 deletions(-)

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