[Pkg-privacy-commits] [golang-goptlib] 02/05: Merge tag 'upstream/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 golang-goptlib.

commit ec2c7ef98f69db5d35739f6f05fd3a91efcf2a5d
Merge: 4d99431 b651149
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu May 12 17:03:40 2016 +0200

    Merge tag 'upstream/0.6'
    
    Upstream version 0.6
    
    # gpg: Signature made Thu 12 May 2016 17:03:39 CEST
    # 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]

 README                                |   3 +-
 examples/dummy-client/dummy-client.go |   2 +-
 examples/dummy-server/dummy-server.go |   2 +-
 pt.go                                 |  76 +++---
 pt_test.go                            | 124 +++------
 socks.go                              | 386 +++++++++++++++++++++-----
 socks_test.go                         | 495 ++++++++++++++++++++++++----------
 7 files changed, 762 insertions(+), 326 deletions(-)

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