commit ea3ee6b5cf035a9465c02b4a2b38882c9c6a7050
Author: David Fifield <[email protected]>
Date: Sat Dec 19 00:41:38 2015 -0800
Rearrange imports.
---
websocket-client/websocket-client.go | 7 ++++---
websocket-server/websocket-server.go | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/websocket-client/websocket-client.go
b/websocket-client/websocket-client.go
index 8943a97..c035e58 100644
--- a/websocket-client/websocket-client.go
+++ b/websocket-client/websocket-client.go
@@ -7,7 +7,6 @@
package main
import (
- "golang.org/x/net/websocket"
"flag"
"fmt"
"io"
@@ -18,9 +17,11 @@ import (
"os/signal"
"sync"
"syscall"
-)
-import "git.torproject.org/pluggable-transports/goptlib.git"
+ "golang.org/x/net/websocket"
+
+ "git.torproject.org/pluggable-transports/goptlib.git"
+)
var ptInfo pt.ClientInfo
diff --git a/websocket-server/websocket-server.go
b/websocket-server/websocket-server.go
index 0d065cc..6fb5a0b 100644
--- a/websocket-server/websocket-server.go
+++ b/websocket-server/websocket-server.go
@@ -19,11 +19,11 @@ import (
"sync"
"syscall"
"time"
-)
-import "../websocket"
+ "../websocket"
-import "git.torproject.org/pluggable-transports/goptlib.git"
+ "git.torproject.org/pluggable-transports/goptlib.git"
+)
const ptMethodName = "websocket"
const requestTimeout = 10 * time.Second
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
