[Pkg-privacy-commits] [obfsproxy] 338/353: Merge tag 'upstream/0.2.11'

[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 892b194bff1625385fe20939984eb90af776dff7
Merge: 0ef0eee 6cf1844
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Jul 16 19:32:47 2014 +0200

    Merge tag 'upstream/0.2.11'
    
    Upstream version 0.2.11

 ChangeLog                                          |  45 +++
 PKG-INFO                                           |   2 +-
 bin/obfsproxy                                      |   2 +-
 doc/scramblesuit/scramblesuit-spec.txt             | 128 ++++--
 obfsproxy/_version.py                              |   4 +-
 obfsproxy/common/aes.py                            |  11 +-
 obfsproxy/common/transport_config.py               |  11 +
 obfsproxy/managed/client.py                        |  22 +-
 obfsproxy/managed/server.py                        |   8 +-
 obfsproxy/network/extended_orport.py               |   3 +
 obfsproxy/network/http.py                          | 142 +++++++
 obfsproxy/network/network.py                       | 103 ++++-
 obfsproxy/network/socks.py                         |  30 +-
 obfsproxy/network/socks5.py                        |  32 +-
 obfsproxy/pyobfsproxy.py                           |  41 +-
 obfsproxy/test/transports/test_scramblesuit.py     | 180 ++++++++-
 obfsproxy/transports/base.py                       |   3 +
 obfsproxy/transports/obfs2.py                      |   6 +-
 obfsproxy/transports/obfs3.py                      |   3 +-
 obfsproxy/transports/scramblesuit/const.py         |  13 +-
 obfsproxy/transports/scramblesuit/packetmorpher.py |  37 +-
 obfsproxy/transports/scramblesuit/scramblesuit.py  | 142 +++++--
 obfsproxy/transports/scramblesuit/state.py         |  36 +-
 obfsproxy/transports/scramblesuit/uniformdh.py     |  32 +-
 obfsproxy/transports/scramblesuit/unittests.py     | 438 ---------------------
 obfsproxy/transports/scramblesuit/util.py          |  12 +-
 setup.py                                           |   6 +-
 27 files changed, 921 insertions(+), 571 deletions(-)

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