[Pkg-privacy-commits] [obfsproxy] 01/15: Merge tag 'debian/0.2.6-2' into wheezy-backports

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch wheezy-backports
in repository obfsproxy.

commit 3da5b5d5af8cebe688c4e069fd657524b1d5b553
Merge: 774171f 9d166a3
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Feb 22 12:02:16 2014 +0000

    Merge tag 'debian/0.2.6-2' into wheezy-backports
    
    Format: 1.8
    Date: Tue, 11 Feb 2014 00:16:39 +0100
    Source: obfsproxy
    Binary: obfsproxy
    Architecture: source all
    Version: 0.2.6-2
    Distribution: unstable
    Urgency: low
    Maintainer: Jérémy Bobbio <lunar at debian.org>
    Changed-By: Jérémy Bobbio <lunar at debian.org>
    Description:
     obfsproxy  - pluggable transport proxy for Tor
    Changes:
     obfsproxy (0.2.6-2) unstable; urgency=low
     .
       * Use proper version number in debian/NEWS.
       * Fix capitalization of ScrambleSuit.
    Checksums-Sha1:
     720c6d7396110c4bb2ff4acc148d15c30219f603 1145 obfsproxy_0.2.6-2.dsc
     5b94d28e5896fa3de8f0805e08732f6089f18608 13616 obfsproxy_0.2.6-2.debian.tar.xz
     cf82c5fc45ba69c14deef95ab3623d705eb4cafd 58546 obfsproxy_0.2.6-2_all.deb
    Checksums-Sha256:
     5636fcec9b67c693a0cbb7ea7f7566f743b1a0aae7e366d7f5eb0c0916af1647 1145 obfsproxy_0.2.6-2.dsc
     661f475765072a0d577392e44eb4a1458b06d84d233e113e9ecc3f9be91bbf7f 13616 obfsproxy_0.2.6-2.debian.tar.xz
     3e5a1954e0e683c6d0d35344395ff36739da263e726114f571e25306c24b8848 58546 obfsproxy_0.2.6-2_all.deb
    Files:
     32f39a53d7db93c10639475db86099f0 1145 net extra obfsproxy_0.2.6-2.dsc
     d72bcd055c50bcf3958c259ddd194e17 13616 net extra obfsproxy_0.2.6-2.debian.tar.xz
     4cfe9823c8d83d6bd644d4f15c7cb97a 58546 net extra obfsproxy_0.2.6-2_all.deb

 ChangeLog                                          |  30 +
 PKG-INFO                                           |   2 +-
 debian/NEWS                                        |  21 +
 debian/README.Debian                               |  19 +-
 debian/changelog                                   |  16 +
 debian/control                                     |   2 +-
 debian/obfsproxy.1.txt                             |  39 +-
 debian/source/include-binaries                     |   1 +
 debian/upstream-signing-key.pgp                    | Bin 0 -> 7193 bytes
 debian/watch                                       |   5 +-
 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 +-
 54 files changed, 3201 insertions(+), 879 deletions(-)

diff --cc debian/changelog
index ab0605c,e00e103..bc8a94e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ obfsproxy (0.2.6-2) unstable; urgency=low
+ 
+   * Use proper version number in debian/NEWS.
+   * Fix capitalization of ScrambleSuit.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Tue, 11 Feb 2014 00:16:39 +0100
+ 
+ obfsproxy (0.2.6-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Configure watch file to verify upstream tarball signature.
+   * Update documentation to add Scramblesuit.
+   * Update Standards-Version, no changes required.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Mon, 10 Feb 2014 19:16:12 +0100
+ 
 +obfsproxy (0.2.3-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Sat, 05 Oct 2013 17:35:28 +0200
 +
  obfsproxy (0.2.3-1) unstable; urgency=low
  
    * New upstream release.

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