[Pkg-privacy-commits] [obfs4proxy] 144/151: Merge tag 'upstream/0.0.5'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit 53b22c7b2e9104a293d618fd5a9d62a6f658ad9d
Merge: 57d8adb abaca18
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 30 19:42:47 2015 +0200

    Merge tag 'upstream/0.0.5'
    
    Upstream version 0.0.5

 ChangeLog                                      |  10 +
 README.md                                      |   2 +-
 common/drbg/hash_drbg.go                       |   2 +-
 common/log/log.go                              | 203 ++++++++++++
 common/ntor/ntor.go                            |   1 +
 common/probdist/weighted_dist.go               |   2 +-
 common/socks5/args.go                          |  96 ++++++
 common/socks5/args_test.go                     | 144 +++++++++
 common/socks5/rfc1929.go                       | 105 +++++++
 common/socks5/socks5.go                        | 358 +++++++++++++++++++++
 common/socks5/socks_test.go                    | 412 +++++++++++++++++++++++++
 doc/obfs4proxy.1                               |   6 +-
 obfs4proxy/obfs4proxy.go                       | 263 ++++++----------
 obfs4proxy/proxy_http.go                       |   2 +-
 obfs4proxy/proxy_socks4.go                     |   2 +-
 obfs4proxy/pt_extras.go                        |   6 +
 obfs4proxy/termmon.go                          | 135 ++++++++
 obfs4proxy/{log.go => termmon_linux.go}        |  65 +---
 transports/obfs2/obfs2.go                      |  76 +++--
 transports/obfs3/obfs3.go                      |  63 ++--
 transports/obfs4/framing/framing.go            |   6 +-
 transports/obfs4/handshake_ntor.go             |   5 +-
 transports/obfs4/obfs4.go                      |  63 ++--
 transports/obfs4/packet.go                     |  17 +-
 transports/obfs4/statefile.go                  |   6 +-
 transports/scramblesuit/conn.go                |  32 +-
 transports/scramblesuit/handshake_uniformdh.go |   3 +-
 27 files changed, 1705 insertions(+), 380 deletions(-)

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