summaryrefslogtreecommitdiff
path: root/obfs4proxy/obfs4proxy.go
diff options
context:
space:
mode:
authorYawning Angel <yawning@torproject.org>2015-03-23 09:13:19 +0000
committerYawning Angel <yawning@torproject.org>2015-03-23 09:13:19 +0000
commitaed4b723891db1be34eb866a03c62806b58ac148 (patch)
treed7005591e7b6568d5229b63165700c54d782a940 /obfs4proxy/obfs4proxy.go
parent594d45be021144f1297b62d150842aa042e734ec (diff)
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.
Diffstat (limited to 'obfs4proxy/obfs4proxy.go')
-rw-r--r--obfs4proxy/obfs4proxy.go2
1 files changed, 1 insertions, 1 deletions
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"