[Pkg-privacy-commits] [obfsproxy] 230/353: Merge tag 'upstream/0.2.6'

[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 6d76033c6de8a1b1b7cf77ac2149b67b76dd0a4d
Merge: d3d9749 ecf15f4
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Feb 10 18:07:43 2014 +0100

    Merge tag 'upstream/0.2.6'
    
    Upstream version 0.2.6

 ChangeLog                                          |  30 +
 PKG-INFO                                           |   2 +-
 doc/HOWTO.txt                                      |   2 +-
 doc/scramblesuit/ChangeLog                         |  21 +
 doc/scramblesuit/scramblesuit-spec.txt             | 308 ++++++++++
 obfsproxy/_version.py                              |   4 +-
 obfsproxy/common/modexp.py                         |  19 +
 obfsproxy/common/transport_config.py               |  81 +++
 obfsproxy/managed/client.py                        |  14 +-
 obfsproxy/managed/server.py                        |  55 +-
 obfsproxy/network/extended_orport.py               |   3 +-
 obfsproxy/network/launch_transport.py              |  11 +-
 obfsproxy/network/network.py                       |  24 +-
 obfsproxy/network/socks.py                         |   9 +-
 obfsproxy/pyobfsproxy.py                           |  18 +-
 obfsproxy/test/int_tests/obfsproxy_tester.py       |  88 ---
 obfsproxy/test/int_tests/pits.py                   | 227 --------
 obfsproxy/test/int_tests/pits_connections.py       | 109 ----
 obfsproxy/test/int_tests/pits_design.txt           |   2 +
 obfsproxy/test/int_tests/pits_network.py           | 168 ------
 obfsproxy/test/int_tests/pits_transcript.py        | 100 ----
 obfsproxy/test/int_tests/test_case.pits            |  16 -
 obfsproxy/test/int_tests/test_case_simple.pits     |   6 -
 obfsproxy/test/int_tests/test_pits.py              |  70 ---
 obfsproxy/test/tester.py                           |  34 ++
 obfsproxy/transports/b64.py                        |  11 +-
 obfsproxy/transports/base.py                       |  71 ++-
 obfsproxy/transports/dummy.py                      |  15 +-
 obfsproxy/transports/obfs2.py                      |  32 +-
 obfsproxy/transports/obfs3.py                      |  19 +-
 obfsproxy/transports/obfs3_dh.py                   |   5 +-
 .../scramblesuit}/__init__.py                      |   0
 obfsproxy/transports/scramblesuit/const.py         | 106 ++++
 obfsproxy/transports/scramblesuit/fifobuf.py       | 121 ++++
 obfsproxy/transports/scramblesuit/message.py       | 226 ++++++++
 obfsproxy/transports/scramblesuit/mycrypto.py      | 155 +++++
 obfsproxy/transports/scramblesuit/packetmorpher.py |  69 +++
 obfsproxy/transports/scramblesuit/probdist.py      |  98 ++++
 obfsproxy/transports/scramblesuit/replay.py        |  85 +++
 obfsproxy/transports/scramblesuit/scramblesuit.py  | 624 +++++++++++++++++++++
 obfsproxy/transports/scramblesuit/state.py         | 161 ++++++
 obfsproxy/transports/scramblesuit/ticket.py        | 391 +++++++++++++
 obfsproxy/transports/scramblesuit/uniformdh.py     | 185 ++++++
 obfsproxy/transports/scramblesuit/util.py          | 175 ++++++
 obfsproxy/transports/transports.py                 |   4 +
 setup.py                                           |   3 +-
 46 files changed, 3118 insertions(+), 859 deletions(-)

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