[Pkg-privacy-commits] [obfs4proxy] 123/151: Merge tag 'upstream/0.0.4'

[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 e24e50a8fda063969cea3ab31147730f80d41fc0
Merge: 4016335 2410a46
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Feb 26 13:17:26 2015 +0100

    Merge tag 'upstream/0.0.4'
    
    Upstream version 0.0.4

 ChangeLog                                          |   5 +
 README.md                                          |   5 +-
 common/ntor/ntor.go                                |   4 +-
 common/probdist/weighted_dist.go                   |  25 +
 doc/obfs4-spec.txt                                 |  11 +
 doc/obfs4proxy.1                                   |   5 +-
 obfs4proxy/obfs4proxy.go                           |   2 +-
 transports/obfs4/framing/framing.go                |   2 +-
 transports/obfs4/handshake_ntor_test.go            |  88 ++--
 transports/scramblesuit/base.go                    |  88 ++++
 transports/scramblesuit/conn.go                    | 521 +++++++++++++++++++++
 transports/scramblesuit/handshake_ticket.go        | 228 +++++++++
 transports/scramblesuit/handshake_uniformdh.go     | 174 +++++++
 .../scramblesuit/hkdf_expand.go                    |  73 ++-
 transports/transports.go                           |   2 +
 15 files changed, 1152 insertions(+), 81 deletions(-)

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