commit b745ab3c5a08607f0094dcba8fa1178d3ca58438
Merge: 9324923 7ce93df
Author: David Fifield <[email protected]>
Date: Tue Apr 8 22:54:18 2014 -0700
Merge branch 'extension'
Conflicts:
meek-client/meek-client.go
.gitignore | 2 +
firefox/chrome.manifest | 5 +
firefox/components/main.js | 354 +++++++++++++++++++++++++++++++++++++
firefox/install.rdf | 21 +++
meek-client-torbrowser/Makefile | 18 ++
meek-client-torbrowser/linux.go | 12 ++
meek-client-torbrowser/mac.go | 12 ++
meek-client-torbrowser/main.go | 181 +++++++++++++++++++
meek-client-torbrowser/windows.go | 13 ++
meek-client/helper.go | 104 +++++++++++
meek-client/meek-client.go | 24 ++-
meek-client/torrc | 1 +
terminateprocess-buffer/main.go | 38 ++++
13 files changed, 784 insertions(+), 1 deletion(-)
diff --cc meek-client/meek-client.go
index b361c79,536dd69..1300474
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@@ -219,7 -228,8 +228,8 @@@ func main()
var err error
flag.StringVar(&options.Front, "front", "", "front domain name if no
front= SOCKS arg")
+ flag.StringVar(&helperAddr, "helper", "", "address of HTTP helper
(browser extension)")
- flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default
from HTTP_PROXY environment variable")
+ flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default
from HTTP_PROXY environment variable)")
flag.StringVar(&logFilename, "log", "", "name of log file")
flag.StringVar(&options.URL, "url", "", "URL to request if no url=
SOCKS arg")
flag.Parse()
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
