[Pkg-privacy-commits] [obfs4proxy] 13/14: Merge tag 'upstream/0.0.6'

[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 f49acb5b8f8a03950d91a6ba4726279f895a2fc1
Merge: 2d73f38 45cc8f0
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Feb 20 23:24:10 2016 +0100

    Merge tag 'upstream/0.0.6'
    
    Upstream version 0.0.6
    
    # gpg: Signature made Sat 20 Feb 2016 23:24:09 CET
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 .gitignore                                    |   4 +
 ChangeLog                                     |   8 +
 common/log/log.go                             |   2 +-
 doc/obfs4proxy.1                              |   4 +-
 obfs4proxy/obfs4proxy.go                      |  19 +-
 transports/base/base.go                       |  10 +-
 transports/{scramblesuit => meeklite}/base.go |  47 ++--
 transports/meeklite/meek.go                   | 373 ++++++++++++++++++++++++++
 transports/obfs2/obfs2.go                     |  13 +-
 transports/obfs3/obfs3.go                     |  13 +-
 transports/obfs4/obfs4.go                     |  15 +-
 transports/scramblesuit/base.go               |  15 +-
 transports/transports.go                      |  13 +-
 13 files changed, 479 insertions(+), 57 deletions(-)

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