commit - f717cf67aaf232164ee121c1d3b1ef669808e94f
commit + 529e2b2efc36aab8a17e32ba2516fc89d4cbd43a
blob - 16e148eaaa58c36a4f86250a8bc46dc489bbf9f4
blob + b3ed532621fb2f2d0d0f6ad301081b51a9deb2a7
--- .travis.yml
+++ .travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.6
+  - 1.7
 
 script:
   - go test -coverprofile=coverage.txt -covermode=atomic -race
blob - b1409802f09b2d6118b9a09bb03f1e3f947ecbc7
blob + 82e719d61f2683fee7c710f0b6f02a3856a2679c
--- channel.go
+++ channel.go
@@ -10,7 +10,7 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // Channel defines the operations necessary to implement a 9p message channel
blob - 920bfafaf141a4676e179f09535874586495d5f9
blob + 0a06e0cce5533ef9907949cdef4d3564a63b3408
--- client.go
+++ client.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 type client struct {
blob - eeb8602d9fb3f99ab4c6e30db11507cead9be29b
blob + dfa24ce4e25bd059ff5d9171f7a77f4b18916450
--- context.go
+++ context.go
@@ -1,7 +1,7 @@
 package p9p
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 type contextKey string
blob - c339ab88ff81d8dc80a586bbe83eb86604ba7724
blob + bbb58773a855b7c965006c2282f4142c116b8039
--- dispatcher.go
+++ dispatcher.go
@@ -1,6 +1,6 @@
 package p9p
 
-import "golang.org/x/net/context"
+import "context"
 
 // Handler defines an interface for 9p message handlers. A handler
 // implementation could be used to intercept calls of all types before sending
blob - 28cccaabbf10d0cf1838c5776d073e4237174143
blob + 1f0419c579d73a6f4af29792367ac0848ee3c57d
--- readdir.go
+++ readdir.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"io"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // ReaddirAll reads all the directory entries for the resource fid.
blob - 2c5ec955994e20ddbba22d86b7c3b9c475d23344
blob + 417aed22503a0e939ccfa2597bec7c69ca8b0ddf
--- server.go
+++ server.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // TODO(stevvooe): Add net/http.Server-like type here to manage connections.
blob - f6caee94546fa1288f44c7b465ed4da607141329
blob + 429cdab15ed44a658f612e6be6001cedc23dc7dc
--- session.go
+++ session.go
@@ -1,6 +1,6 @@
 package p9p
 
-import "golang.org/x/net/context"
+import "context"
 
 // Session provides the central abstraction for a 9p connection. Clients
 // implement sessions and servers serve sessions. Sessions can be proxied by
blob - fc3f1aff6c17e0634c0806bf1be9f04524bff27c
blob + 83d3ce1931c4e35c573ccc40da290fbb48e5dc32
--- transport.go
+++ transport.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"sync"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // roundTripper manages the request and response from the client-side. A
blob - ac301cabe46e1eb22162b85c9d69f235414b3af6
blob + d58caf89975079c06e865c1de3d9d9b2093317ce
--- version.go
+++ version.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"fmt"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // NOTE(stevvooe): This file contains functions for negotiating version on the