[Pkg-privacy-commits] [obfsproxy] 187/353: Merge tag 'upstream/0.2.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 eb173cee1125224b0b26f685cc8c33edde7d8393
Merge: e7d18d8 b9255b7
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Sep 20 16:29:05 2013 +0200

    Merge tag 'upstream/0.2.3'
    
    Upstream version 0.2.3

 ChangeLog                             |  20 +
 INSTALL                               |   4 +-
 LICENSE                               | 193 ---------
 PKG-INFO                              |   2 +-
 README                                |   3 +-
 TODO                                  |   2 +-
 bin/obfsproxy                         |  18 +-
 doc/HOWTO.txt                         |  50 +--
 doc/licenses/LICENSE.PYTHON           | 773 ----------------------------------
 obfsproxy/_version.py                 |   4 +-
 obfsproxy/common/argparser.py         |  12 +
 obfsproxy/managed/client.py           |  17 +-
 obfsproxy/managed/server.py           |  28 +-
 obfsproxy/network/extended_orport.py  | 150 ++++---
 obfsproxy/network/launch_transport.py |   2 +-
 obfsproxy/network/socks.py            |  19 +-
 obfsproxy/pyobfsproxy.py              |  22 +-
 setup.py                              |  11 +-
 18 files changed, 222 insertions(+), 1108 deletions(-)

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