[Pkg-privacy-commits] [obfsproxy] 11/15: Merge tag 'debian/0.2.11-1' 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 a31de3dc5bec8404675a0f5433a447abe5cb68c4
Merge: 58c79f6 3194106
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Sep 3 00:02:17 2014 +0000

    Merge tag 'debian/0.2.11-1' into wheezy-backports
    
    Format: 1.8
    Date: Fri, 18 Jul 2014 23:39:18 +0200
    Source: obfsproxy
    Binary: obfsproxy
    Architecture: source all
    Version: 0.2.11-1
    Distribution: unstable
    Urgency: medium
    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.11-1) unstable; urgency=medium
     .
       * New upstream release.
       * Update Build-Depends and Depends.
       * Document how to use a ScrambleSuit bridge in README.Debian.
    Checksums-Sha1:
     4ffb4c029fca40d9021ff7f26d9c914b9ef17c1c 1187 obfsproxy_0.2.11-1.dsc
     611747cb4dc56d810563eecc95cffed452c00a59 92043 obfsproxy_0.2.11.orig.tar.gz
     72a5c2219b554b993421c8203b28690e45bec424 13884 obfsproxy_0.2.11-1.debian.tar.xz
     4cf15a2e15294204fb711d155c8fcf3a87faa098 73500 obfsproxy_0.2.11-1_all.deb
    Checksums-Sha256:
     cf117fb8dd15a89dead344686817ec6f3deb6287b06117e2c49d67c51a03faab 1187 obfsproxy_0.2.11-1.dsc
     1c6fa00298ce522ac407c80b249ff28f867d87679dcc1705f1293d58bb1bff14 92043 obfsproxy_0.2.11.orig.tar.gz
     f8c78290b414075e4fe5a90d25be72559119b0090ba0c90bb7dba64df0b49170 13884 obfsproxy_0.2.11-1.debian.tar.xz
     a4331554e3d67114596d0f78f43ae97ec9355e039be4a34b8f9c53fa6fc1c14a 73500 obfsproxy_0.2.11-1_all.deb
    Files:
     2e9ee7a721d31c6ef2d2c95849821943 73500 net extra obfsproxy_0.2.11-1_all.deb
     a09855a66a9fe59ef140d46c2425cb02 1187 net extra obfsproxy_0.2.11-1.dsc
     ddefaf8274a699031d946e910b40f2d4 92043 net extra obfsproxy_0.2.11.orig.tar.gz
     b7db00e2fc1b65463c9a30e7f8dcf0ea 13884 net extra obfsproxy_0.2.11-1.debian.tar.xz
    
    Conflicts:
    	debian/control
    	debian/pydist-overrides

 ChangeLog                                          |  45 +++
 PKG-INFO                                           |   2 +-
 bin/obfsproxy                                      |   2 +-
 debian/README.Debian                               |   6 +
 debian/changelog                                   |   8 +
 debian/control                                     |   5 +-
 debian/pydist-overrides                            |   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 +-
 31 files changed, 939 insertions(+), 574 deletions(-)

diff --cc debian/changelog
index 5ad3547,99d36e5..be9cc17
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
+ obfsproxy (0.2.11-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Build-Depends and Depends.
+   * Document how to use a ScrambleSuit bridge in README.Debian.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Fri, 18 Jul 2014 23:39:18 +0200
+ 
 +obfsproxy (0.2.8-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +  * Drop obsolete patch.
 +  * Depend on the full Twisted stack.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Tue, 13 May 2014 20:24:32 +0200
 +
  obfsproxy (0.2.8-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/control
index 44d52e7,b6f3c89..3137d12
--- a/debian/control
+++ b/debian/control
@@@ -7,9 -7,10 +7,10 @@@ Build-Depends: asciidoc
                 docbook-xsl,
                 python-all (>= 2.6.6-3~),
                 python-crypto,
-                python-pyptlib (>= 0.0.4),
+                python-pyptlib (>= 0.0.6),
                 python-setuptools,
-                python-twisted (>= 13.2),
 -               python-twisted-core,
++               python-twisted-core (>= 13.2),
+                python-txsocksx,
                 python-yaml,
                 xsltproc
  Standards-Version: 3.9.5
diff --cc debian/pydist-overrides
index a583f03,f02f489..9b6e9fd
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@@ -1,2 -1,1 +1,2 @@@
- pyptlib python-pyptlib (>= 0.0.4)
+ pyptlib python-pyptlib (>= 0.0.6)
 +twisted python-twisted (>= 13.2)

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