[tor-commits] [obfs-flash/master] - fix websocket-server program name, somehow omitted from last commit

infinity0 at torproject.org infinity0 at torproject.org
Mon Jun 2 18:34:06 UTC 2014


commit f84a749a5fd10f36d0d0d2aab14eb3a5e4da9dec
Author: Ximin Luo <infinity0 at torproject.org>
Date:   Mon Jun 2 19:33:17 2014 +0100

    - fix websocket-server program name, somehow omitted from last commit
---
 obfs-flash-server.go |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/obfs-flash-server.go b/obfs-flash-server.go
index 1a5c9b5..bb34219 100644
--- a/obfs-flash-server.go
+++ b/obfs-flash-server.go
@@ -444,7 +444,7 @@ func getConfiguration() (conf *Configuration) {
 	conf.Aliases = make(map[string]string)
 	conf.Options = make(map[string]pt.Args)
 	conf.Transports["obfs3"] = []string{"obfsproxy", "managed"}
-	conf.Transports["websocket"] = []string{"websocket-server"}
+	conf.Transports["websocket"] = []string{"pt-websocket-server"}
 	// conf.Options["obfs3"] = make(pt.Args)
 	// conf.Options["obfs3"]["secret"] = []string{"foo"}
 	conf.Aliases["obfs3_websocket"] = "obfs3|websocket"



More information about the tor-commits mailing list