[Pkg-privacy-commits] [obfsproxy] 293/353: Merge branch 'bug8956_tweak'

[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 e7c4294ee4965f6bd4f5d3edd7c28d3d9cb0f582
Merge: b58fd9e a2dc745
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Apr 16 16:31:35 2014 +0300

    Merge branch 'bug8956_tweak'
    
    Conflicts:
    	ChangeLog

 ChangeLog                            |   4 +
 obfsproxy/common/transport_config.py |  11 +++
 obfsproxy/managed/client.py          |   6 ++
 obfsproxy/network/http.py            | 142 +++++++++++++++++++++++++++++++++++
 obfsproxy/network/network.py         |  66 +++++++++++++++-
 obfsproxy/network/socks.py           |  30 +++++++-
 obfsproxy/network/socks5.py          |  23 +++++-
 obfsproxy/pyobfsproxy.py             |  21 ++++++
 setup.py                             |   5 +-
 9 files changed, 298 insertions(+), 10 deletions(-)

diff --cc ChangeLog
index 91cd8df,77e8062..6cf2400
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,8 +1,19 @@@
 -Changes in version 0.2.8 - UNRELEASED
 +Changes in version 0.2.9 - UNRELEASED:
+  - Support connecting over a HTTPS CONNECT proxy.  Patch by Yawning Angel.
+    Fixes #11409.
+  - Support connecting over SOCKS4(a) and SOCKS5.  Based on the patch by
+    Arturo Filastò with changes by Yawning Angel.  Fixes #8956.
 + - Fix the shebang of the obfsproxy executable so that it
 +   explicitly picks python2.  Makes obfsproxy work in platforms like
 +   Linux Arch where python3 is the default.  Fixes part of #11190.
 +   Patch by Yawning Angel.
 +
 +
 +Changes in version 0.2.8 - 2014-03-28:
 + - Fix a bug in the SOCKS5 sever code.  An exception would be raised on systems
 +   with Python < 2.7.4.  Patch by Yawning Angel.  Fixes #11329.
 + - Obfsproxy can now resolve bridge addresses that were provided as
 +   DNS hostnames.  Fix suggested by Yawning Angel. Resolves #10316.
  
  
  Changes in version 0.2.7 - 2014-03-15

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