commit cfca47674e79c6853bdfb2410a3c42ae240fd929 Author: David Fifield david@bamsoftware.com Date: Sat Mar 26 12:06:06 2016 -0700

Build the websocket-server.

Patch server.go to refer to out-of-tree websocket library. --- .gitignore | 1 + Makefile | 2 +- server/server.go | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore index 784e6c4..22101d6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ datadir/ client/client server-webrtc/server-webrtc +server/server snowflake.log proxy/test proxy/build diff --git a/Makefile b/Makefile index fbf12ae..0608eca 100644 --- a/Makefile +++ b/Makefile @@ -2,4 +2,4 @@ .PHONY: check check: ! gofmt -l . 2>&1 | read - go vet ./broker ./client ./server-webrtc + go vet ./broker ./client ./server ./server-webrtc diff --git a/server/server.go b/server/server.go index 6fb5a0b..986fd35 100644 --- a/server/server.go +++ b/server/server.go @@ -20,9 +20,8 @@ import ( "syscall" "time"

- "../websocket" - "git.torproject.org/pluggable-transports/goptlib.git" + "git.torproject.org/pluggable-transports/websocket.git/websocket" )

const ptMethodName = "websocket"