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

commit 16e95607967862fe2ed532f9de94d226d82f36e7
Merge: 78f0a83 0136c83
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Mon Jul 6 11:55:56 2015 +0200

    Merge tag 'upstream/0.5'
    
    Upstream version 0.5
    
    # gpg: Signature made Mon 06 Jul 2015 11:55:55 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]

 examples/dummy-client/dummy-client.go |  17 ++++--
 examples/dummy-server/dummy-server.go |   6 +-
 proxy_test.go                         |  80 +++++++++++++++++++++++++
 pt.go                                 |  78 ++++++++++++++++++++++---
 pt_test.go                            |   6 +-
 socks.go                              |  25 ++++----
 socks_test.go                         | 107 ++++++++++++++++++++++++++++++++++
 7 files changed, 289 insertions(+), 30 deletions(-)

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