commit aed4b723891db1be34eb866a03c62806b58ac148 Author: Yawning Angel yawning@torproject.org Date: Mon Mar 23 09:13:19 2015 +0000

Change the import path for go.net.

The Go developers decided to move the go.net repository to golang.org/x/net, and also to transition from hg to git. This wasn't changed when the go.crypto imports were since the 'proxy' component doesn't have imports that break, so the old code still works.

While the change here is simple (just update the import location), this affects packagers as it now expects the updated package. Sorry for the inconveneince, I blame the Go people, and myself for not just doing this along with the go.crypto changes. --- ChangeLog | 1 + README.md | 2 +- obfs4proxy/obfs4proxy.go | 2 +- obfs4proxy/proxy_http.go | 2 +- obfs4proxy/proxy_socks4.go | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 9b6c0b5..b012ef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Changes in version 0.0.5 - UNRELEASED: - Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan. + - Changed the go.net import path to the new location (golang.org/x/net).

Changes in version 0.0.4 - 2015-02-17 - Improve the runtime performance of the obfs4 handshake tests. diff --git a/README.md b/README.md index 31c9e2b..3f1f6b9 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ listed for clarity. * Go 1.2.0 or later. Prior versions of Go (Eg: 1.0.2) are missing certain important parts of the runtime library like a SHA256 implementation. * go.crypto (https://golang.org/x/crypto) - * go.net (https://code.google.com/p/go.net) + * go.net (https://golang.org/x/net) * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519) * SipHash-2-4 (https://github.com/dchest/siphash) * goptlib (https://git.torproject.org/pluggable-transports/goptlib.git) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index e489b57..53a0218 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -43,7 +43,7 @@ import ( "sync" "syscall"

- "code.google.com/p/go.net/proxy" + "golang.org/x/net/proxy"

"git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/obfs4.git/transports" diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go index 2db6ca0..6f11790 100644 --- a/obfs4proxy/proxy_http.go +++ b/obfs4proxy/proxy_http.go @@ -36,7 +36,7 @@ import ( "net/url" "time"

- "code.google.com/p/go.net/proxy" + "golang.org/x/net/proxy" )

// httpProxy is a HTTP connect proxy. diff --git a/obfs4proxy/proxy_socks4.go b/obfs4proxy/proxy_socks4.go index 9d6bd4d..536dd96 100644 --- a/obfs4proxy/proxy_socks4.go +++ b/obfs4proxy/proxy_socks4.go @@ -41,7 +41,7 @@ import ( "net/url" "strconv"

- "code.google.com/p/go.net/proxy" + "golang.org/x/net/proxy" )

// socks4Proxy is a SOCKS4 proxy.