update gs

Allow Firefox to break completely free of the Go app should the dev choose to do so
make it possible to just import it and use it in another app
2020-09-09 21:17:43 -04:00 · 2020-09-06 17:41:59 -04:00 · 2020-09-06 16:55:22 -04:00 · 2020-08-24 00:54:46 -04:00 · 2020-08-24 00:46:57 -04:00 · 2020-08-23 23:26:14 -04:00
22 changed files with 2129 additions and 256 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,5 @@ i2pd/
 i2pd.tar.gz
 tunnels.conf
 .i2cp.conf
+basic/*
+tmp/*
--- a/54
+++ b/54
@ -0,0 +1,54 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2020 idk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+This project bundles other open source software in it's binary form, much of
+which is released under other licenses. Copies of the respective licences are
+available in the licenses directory.
+
+It incorporates a de-branded Firefox fork by way of GNU IceCat, which includes
+code available under the GPL2, MPL, and other licenses. Trademarks related to
+Mozilla Firefox have been removed completely with the assistance of IceCat's
+makeicecat script.
+
+It also incorporates i2p-zero, which is a standalone, dependency-free downstream
+of I2P. i2p-zero is released under the BSD three-clause license. I2P itself is
+released primarily into the public domain, with some components falling under
+other licenses. For more information, see:
+
+https://geti2p.net/en/get-involved/develop/licenses
+
+Extensions are used under their own respective licenses, which are included
+in the extension.xpi files.
+
+uBlock Origin - Copyright Raymond Gorhill - GPLv3
+uMatrix - Copyright Raymond Gorhill - GPLv3
+I2P in Private Browsing - Copyright idk - MIT
+Snowflake - Copyright the Tor Project - 3-Clause BSD
+
+// If you are working on this and notice a file where I did not include something
+// to indicate which license is in use, please use the following template.
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
--- a/84
+++ b/84
@ -2,16 +2,23 @@
 export GO111MODULE=on
 GO111MODULE=on

-VERSION=0.73
+BIN_NAME=i2pbrowser
+
+EXT_VERSION=0.73
 SNOW_VERSION=0.2.2
 UMAT_VERSION=1.25.2
 UBLO_VERSION=1.4.0
 NOSS_VERSION=11.0.23
-ZERO_VERSION=v1.16
-LAUNCH_VERSION=$(VERSION).092
+ZERO_VERSION=v1.17
+ZERO_VERSION_B=`echo $(ZERO_VERSION) | tr -d 'v.'`
+LAST_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).097
+LAUNCH_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).098

 GO_COMPILER_OPTS = -a -tags netgo -ldflags '-w -extldflags "-static"'

+echo:
+	echo $(LAUNCH_VERSION)
+
 build:
 	go build $(GO_COMPILER_OPTS)

@ -21,7 +28,7 @@ gen:
 	go run $(GO_COMPILER_OPTS) -tags generate gen.go extensions.go

 clean: fmt
-	rm -f i2pfirefox*
+	rm -f $(BIN_NAME)*

 fmt:
 	gofmt -w -s *.go
@ -44,31 +51,31 @@ all: pure variant
 pure: fmt lib/assets.go windows osx linux

 windows: fmt
-	GOOS=windows go build $(GO_COMPILER_OPTS) -o i2pfirefox.exe
+	GOOS=windows go build $(GO_COMPILER_OPTS) -o $(BIN_NAME).exe

 osx: fmt
-	GOOS=darwin go build $(GO_COMPILER_OPTS) -o i2pfirefox-darwin
+	GOOS=darwin go build $(GO_COMPILER_OPTS) -o $(BIN_NAME)-darwin

 linux: fmt
-	GOOS=linux go build $(GO_COMPILER_OPTS) -o i2pfirefox
+	GOOS=linux go build $(GO_COMPILER_OPTS) -o $(BIN_NAME)

-variant: fmt assets.go vwindows vosx vlinux
+variant: fmt lib/assets.go vwindows vosx vlinux

 vwindows: fmt
-	GOOS=windows go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant.exe
+	GOOS=windows go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant.exe

 vosx: fmt
-	GOOS=darwin go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant-darwin
+	GOOS=darwin go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant-darwin

 vlinux: fmt
-	GOOS=linux go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant
+	GOOS=linux go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant

-sumwindows=`sha256sum i2pfirefox.exe`
-sumlinux=`sha256sum i2pfirefox`
-sumdarwin=`sha256sum i2pfirefox-darwin`
-sumvwindows=`sha256sum i2pfirefox-variant.exe`
-sumvlinux=`sha256sum i2pfirefox-variant`
-sumvdarwin=`sha256sum i2pfirefox-variant-darwin`
+sumwindows=`sha256sum $(BIN_NAME).exe`
+sumlinux=`sha256sum $(BIN_NAME)`
+sumdarwin=`sha256sum $(BIN_NAME)-darwin`
+sumvwindows=`sha256sum $(BIN_NAME)-variant.exe`
+sumvlinux=`sha256sum $(BIN_NAME)-variant`
+sumvdarwin=`sha256sum $(BIN_NAME)-variant-darwin`

 check:
 	echo "$(sumwindows)"
@ -79,31 +86,48 @@ check:
 	echo "$(sumvdarwin)"

 release:
-	gothub release -p -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -n "Launchers" -d "A self-configuring launcher for mixed I2P and clearnet Browsing with Firefox"
+	gothub release -p -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -n "Launchers" -d "A self-configuring launcher for mixed I2P and clearnet Browsing with Firefox"
+	sed -i "s|$(LAST_VERSION)|$(LAUNCH_VERSION)|g" README.md
+	sed -i "s|$(LAST_VERSION)|$(LAUNCH_VERSION)|g" Makefile
+	git commit -am "Make release version $(LAUNCH_VERSION)" && git push

-upload:
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumwindows)" -n "i2pfirefox.exe" -f "i2pfirefox.exe"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumdarwin)" -n "i2pfirefox-darwin" -f "i2pfirefox-darwin"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumlinux)" -n "i2pfirefox" -f "i2pfirefox"
+upload: upload-windows upload-darwin upload-linux

-upload-variant:
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvwindows)" -n "i2pfirefox-variant.exe" -f "i2pfirefox-variant.exe"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvdarwin)" -n "i2pfirefox-variant-darwin" -f "i2pfirefox-variant-darwin"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvlinux)" -n "i2pfirefox-variant" -f "i2pfirefox-variant"
+upload-windows:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumwindows)" -n "$(BIN_NAME).exe" -f "$(BIN_NAME).exe"
+
+upload-darwin:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumdarwin)" -n "$(BIN_NAME)-darwin" -f "$(BIN_NAME)-darwin"
+
+upload-linux:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumlinux)" -n "$(BIN_NAME)" -f "$(BIN_NAME)"
+
+upload-variant: upload-variant-windows upload-variant-darwin upload-variant-linux
+
+upload-variant-windows:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvwindows)" -n "$(BIN_NAME)-variant.exe" -f "$(BIN_NAME)-variant.exe"
+
+upload-variant-darwin:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvdarwin)" -n "$(BIN_NAME)-variant-darwin" -f "$(BIN_NAME)-variant-darwin"
+
+upload-variant-linux:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvlinux)" -n "$(BIN_NAME)-variant" -f "$(BIN_NAME)-variant"

 upload-all: upload upload-variant

 release-all: release upload-all

 release-pure:
-	make pure
 	make release; true
-	make upload
+	make linux upload-linux
+	make windows upload-windows
+	make osx upload-darwin

 release-variant: 
-	make variant
 	make release; true
-	make upload-variant
+	make vlinux upload-variant-linux
+	make vwindows upload-variant-windows
+	make vosx upload-variant-darwin

 clean-release: clean release-pure release-variant

--- a/README.md
+++ b/README.md
@ -29,13 +29,22 @@ description.

 ```Bash
 # Linux
-wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/0.73.091/i2pfirefox
+wget -O i2pfirefox https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox
+sha256sum i2pfirefox

 # Windows
-wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/0.73.091/i2pfirefox.exe
+wget -O i2pfirefox.exe https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox.exe
+does-windows-even-have-sha25sum i2pfirefox.exe

 # OSX
-wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/0.73.091/i2pfirefox-darwin
+wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox-darwin
+sha256sum i2pfirefox-darwin
+```
+
+You may need to mark the downloaded file as executable, like this:
+
+```Bash
+chmod +x i2pfirefox*
 ```

 Go developers with at least go 1.14 installed can build it from source with:
--- a/firefox.go
+++ b/firefox.go
@ -1,7 +0,0 @@
-package main
-
-import "github.com/eyedeekay/i2pfirefox/lib"
-
-func firefoxMain() {
-	i2pfirefox.FirefoxMain()
-}
--- a/gen.go
+++ b/gen.go
@ -2,6 +2,11 @@

 package main

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 import (
 	"crypto/sha256"
 	"fmt"
--- a/go.mod
+++ b/go.mod
@ -1,19 +1,17 @@
-module github.com/eyedeekay/i2pfirefox
+module github.com/eyedeekay/i2pbrowser

 go 1.14

 require (
-	github.com/akavel/rsrc v0.9.0 // indirect
-	github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa
 	github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e
-	github.com/eyedeekay/checki2cp v0.0.17
-	github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a
-	github.com/eyedeekay/go-fpw v0.0.0-20200512022837-c8b4dcdc74d4
+	github.com/eyedeekay/go-fpw v0.0.0-20200805184710-5435dc443213
 	github.com/eyedeekay/httptunnel v0.0.0-20200116022455-631ab90f707d
-	github.com/eyedeekay/zerobundle v0.0.0-20200804040541-f28536b381d0
+	github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15
+	github.com/frankban/quicktest v1.4.0 // indirect
 	github.com/klauspost/compress v1.10.10 // indirect
 	github.com/klauspost/pgzip v1.2.4 // indirect
-	github.com/pierrec/lz4/v3 v3.3.2 // indirect
 	github.com/zserge/lorca v0.1.9
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -2,7 +2,6 @@ bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxo
 cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 crawshaw.io/littleboss v0.0.0-20190317185602-8957d0aedcce/go.mod h1:TIbCAHgttUfOKudw59Il7Z0XIlitzo228/mtwMe4vPM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
@ -11,8 +10,6 @@ github.com/RoaringBitmap/roaring v0.4.18/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrX
 github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/akavel/rsrc v0.9.0 h1:HwUDC0+tMFWqN4D5G+o5siGD4oVsC3jn6zM8ocjc3nY=
-github.com/akavel/rsrc v0.9.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alexflint/go-arg v1.1.0/go.mod h1:3Rj4baqzWaGGmZA2+bVTV8zQOZEjBQAPBnL5xLT+ftY=
@ -78,6 +75,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e h1:2q8XPjAYhXX8H71AoAPdgBrCUA3HPhC4ax8XHrTsY6I=
 github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e/go.mod h1:y80zLCg0QS5u3fJKeF2rwpezcyZuCpZpbFcWv6Pn98w=
@ -89,6 +88,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/d5/tengo v1.24.3/go.mod h1:VhLq8Q2QFhCIJO3NhvM934qOThykMqJi9y9Siqd1ocQ=
 github.com/danfragoso/thdwb v0.0.0-20191106005607-18cfeb88e782/go.mod h1:IXu355OpbfEz78+tgu81vte3YA/MEWQKBu/dXod4NM0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
@ -105,16 +105,14 @@ github.com/elliotchance/orderedmap v1.2.0/go.mod h1:8hdSl6jmveQw8ScByd3AaNHNk51R
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb h1:tUfxSHBVabVBpX0Rcupybxr7pBfG2E+p3N7EX4p9sc0=
 github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb/go.mod h1:PY7znvZ1ZF1QG5/4j9u769EX49l49z2rCdE0o4z8fMw=
-github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802060059-8ed0bfff2fe9 h1:TPJAkbZebNUAoSLhhGKOI1u8y3R7f1yeLvcwgSohp/M=
-github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802060059-8ed0bfff2fe9/go.mod h1:XchhjbeZKhEszN64SHavfaLGP2lFhWeO0ipH4cyBq5o=
+github.com/eyedeekay/GingerShrew v0.0.0-20200823015403-11c67f550c33 h1:VD2HttHlFt6wfTjkbJMt/M/pmQT8Iq0I7CmEG81dwVM=
+github.com/eyedeekay/GingerShrew v0.0.0-20200823015403-11c67f550c33/go.mod h1:kDfSkqEyzswi8r4m6U0Q9jD4PJqOzKXVCX4XbYhBJCs=
+github.com/eyedeekay/GingerShrew v0.0.0-20200824044622-7e8d465550e5 h1:vUDYV/R8RNo7cxVN4ftdrXa9zsGQ74Bot5E/LMndhv0=
+github.com/eyedeekay/GingerShrew v0.0.0-20200824044622-7e8d465550e5/go.mod h1:kDfSkqEyzswi8r4m6U0Q9jD4PJqOzKXVCX4XbYhBJCs=
+github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa h1:wqjB9kcYjAMrw92QxZnbAbdMsfF0FSPq9vsKx98XWrU=
+github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa/go.mod h1:kDfSkqEyzswi8r4m6U0Q9jD4PJqOzKXVCX4XbYhBJCs=
 github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e h1:oEoiXkil4L/ahtVlljDwz5LXbE1qBsJqvC3/utNrKe4=
 github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e/go.mod h1:XchhjbeZKhEszN64SHavfaLGP2lFhWeO0ipH4cyBq5o=
-github.com/eyedeekay/checki2cp v0.0.0-20200403213308-750ce7e6d81f h1:rpkO9pKHoNxoUAH2dY9gtIRt+vDCS3t2VUq5V7ZalXA=
-github.com/eyedeekay/checki2cp v0.0.0-20200403213308-750ce7e6d81f/go.mod h1:ZilEsKkjp1K0e9qfUUdrHnz8teb1LU70L8JQzNSQmO8=
-github.com/eyedeekay/checki2cp v0.0.12 h1:ytAlEx0w928H6pE4IPDVuRsRQjJ30wUjhR0sLIGlOH0=
-github.com/eyedeekay/checki2cp v0.0.12/go.mod h1:ZilEsKkjp1K0e9qfUUdrHnz8teb1LU70L8JQzNSQmO8=
-github.com/eyedeekay/checki2cp v0.0.13 h1:lSOtS7LzInJIPrMbBkoLhlQHloRFMx0u5nFaQl2pDrI=
-github.com/eyedeekay/checki2cp v0.0.13/go.mod h1:3dCAyHmQ0WRd6xsBpL/W62gTcXU4P3kWfigrjeDZpAQ=
 github.com/eyedeekay/checki2cp v0.0.15 h1:Vlwp9opuQJSgp139VVrLkKXRwLYYrXiBkqed35ZbqzY=
 github.com/eyedeekay/checki2cp v0.0.15/go.mod h1:3dCAyHmQ0WRd6xsBpL/W62gTcXU4P3kWfigrjeDZpAQ=
 github.com/eyedeekay/checki2cp v0.0.17 h1:md/CZMugwVrdkppReKoRmrkpELE1qE8gIlSFD8EuYlk=
@ -122,14 +120,10 @@ github.com/eyedeekay/checki2cp v0.0.17/go.mod h1:kdHq1LqZxi2qarfyospSHrh4Aju5Syd
 github.com/eyedeekay/eephttpd v0.0.0-20190903000420-52f5a8485a4e/go.mod h1:wFPQsNBnY95LkuujFEZARo7slafRwoF0D97FFHBoZro=
 github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a h1:zPI9ngyid7Wr92EHYanSOee6z0rWSlyKPt1nnOmZCu4=
 github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a/go.mod h1:k3EtNXTNE8UHnYqq/Ny7QiVPZIFtdiCuckEPT0qkR14=
-github.com/eyedeekay/go-fpw v0.0.0-20200403201858-3d24733073ff h1:nmfiBxYeXYnUUB7sYoez7VT7mB99hFeHeZtXE69ot9A=
-github.com/eyedeekay/go-fpw v0.0.0-20200403201858-3d24733073ff/go.mod h1:F4d0cXDXTK6ZsAnxmATan3VyDV4k9P9ciCGRKt/fVik=
-github.com/eyedeekay/go-fpw v0.0.0-20200404005604-8ccf7dc81580 h1:Eo210WM4t+DLJ5rBmj1fnUAuCEM614zIvVUO7RIeTRw=
-github.com/eyedeekay/go-fpw v0.0.0-20200404005604-8ccf7dc81580/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
-github.com/eyedeekay/go-fpw v0.0.0-20200512000155-818dd5b71e7a h1:Hiv9cEmUjhUbHNzF9l8XyyYGskXFIGs0KJvcxGrzQik=
-github.com/eyedeekay/go-fpw v0.0.0-20200512000155-818dd5b71e7a/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
 github.com/eyedeekay/go-fpw v0.0.0-20200512022837-c8b4dcdc74d4 h1:fZggjpJu/JsYTCn1BjT1SICuEcab8Cyvz3BwI9aDIUw=
 github.com/eyedeekay/go-fpw v0.0.0-20200512022837-c8b4dcdc74d4/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
+github.com/eyedeekay/go-fpw v0.0.0-20200805184710-5435dc443213 h1:QhukeK1UqJLWe6UT/rMnPppdXkLiYDyzOiZ7YAYt6bA=
+github.com/eyedeekay/go-fpw v0.0.0-20200805184710-5435dc443213/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
 github.com/eyedeekay/go-i2cp v0.0.0-20190716135428-6d41bed718b0 h1:rnn9OlD/3+tATEZNuiMR1C84O5CX8bZL2qqgttprKrw=
 github.com/eyedeekay/go-i2cp v0.0.0-20190716135428-6d41bed718b0/go.mod h1:+P0fIhkqIYjo7exMJRTlSteRMbRyHbiBiKw+YlPWk+c=
 github.com/eyedeekay/go-i2pcontrol v0.0.0-20200110011336-510cca77e350/go.mod h1:bhIQsVpbNNXMtcoZ9UF4hLQleOjaCgKGXiRRhNc8TOA=
@ -154,102 +148,36 @@ github.com/eyedeekay/sam3 v0.0.0-20190613034117-99ad6522ebe3/go.mod h1:Vrxh+71E3
 github.com/eyedeekay/sam3 v0.0.0-20190730185140-f8d54526ea25/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=
 github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s=
 github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=
-github.com/eyedeekay/zerobundle v0.0.0-20200729053534-6fdefaab976b h1:o3AMSGxze29dkXAs7bjFTNg/wO1SR29aH9+DLg1Q3Ys=
-github.com/eyedeekay/zerobundle v0.0.0-20200729142507-09254e0fcd4a h1:DP3ZHtWFnq15iGkQ/NAskdxTwyUNhU/TQYGof2FytiQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:wSZgKbze5193l1gvlEMGmC2T9BSmfK/ZFx+w7GpPScE=
-github.com/eyedeekay/zerobundle v0.0.0-20200729232301-a53636329828 h1:ID7+uAh7hFjYhsnENytlvQToWBQjh0L7rzQn/4Iv7OQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200729232301-a53636329828/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801013618-d7f06aa455d4 h1:fsSYcXnqPTvP8mRGDaxDF1U3fzRwiiegbYyh56TnuFQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200801013618-d7f06aa455d4/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801044052-02d339203f7c h1:ilkSjOMPWMjjeYuCLOeGq3a7pVlSzcZndNC6XjAOp2g=
-github.com/eyedeekay/zerobundle v0.0.0-20200801044052-02d339203f7c/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801171255-e52955df6c06 h1:RMPN939tthCSPX339wS+nLYwZu/CFfJ6ZQ0seFnThbg=
-github.com/eyedeekay/zerobundle v0.0.0-20200801171255-e52955df6c06/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802020224-4ecb0983fab2 h1:34h7sCyBIqL5TbxPJy7LGUrpKUb8s/Db3gJBfd49eJk=
-github.com/eyedeekay/zerobundle v0.0.0-20200802020224-4ecb0983fab2/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802032933-4aae53e45577 h1:aVjc4ct7XsrPXy4RGCntjg+Mp+DucCU6VjTh48W84GQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200802032933-4aae53e45577/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802035941-c66d7eb01340 h1:PaMh/zhViPFXIeJ4sMkRPPBDCuIEGeUaHO0eLNosT98=
-github.com/eyedeekay/zerobundle v0.0.0-20200802035941-c66d7eb01340/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802064839-ff08f711c3f9 h1:ROVKA3xcRXkmgHaNoq/6xJgSZYSo8bzkXF3q1K6j9Wg=
-github.com/eyedeekay/zerobundle v0.0.0-20200802064839-ff08f711c3f9/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802224726-ade60064998c h1:vne+x6MOOLls+wxN23VaJ3qgF8Qq3vdebK4OkpOlxIM=
-github.com/eyedeekay/zerobundle v0.0.0-20200802224726-ade60064998c/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200803002433-d08cdaba1810 h1:09MAije/deFIkcARbMKbAIG3IH2puZjLG5OV45y+F+I=
-github.com/eyedeekay/zerobundle v0.0.0-20200803002433-d08cdaba1810/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200804040541-f28536b381d0 h1:mP6OZ7FpPbkG6u7RqDxiDcLkRRGivsno2JWAgiwucfU=
-github.com/eyedeekay/zerobundle v0.0.0-20200804040541-f28536b381d0/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle/parts v0.0.0-20200729142507-09254e0fcd4a h1:kS2ZOf/ZiHnV+JL/V5yxr4I9qDLSvKXBjmHUm/xCPRM=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729142507-09254e0fcd4a h1:SCBVcTjxLI1idb/Idgf3WJN9FdKKnnauoJCd8QRfMVE=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729225350-f5800a7c3c3f h1:82utnE2TpNxCQRNWclzglpdNvug0MHZxvHjzLTbnRdA=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
+github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc h1:XWYtE6oKCk1sR6phdDSE9RkxDPP4YcHm+/clAK1JuQg=
+github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
+github.com/eyedeekay/zerobundle v0.0.0-20200822030320-56c6bd77f723 h1:WTWh03+SJxAlJtfNDXgMDwmu7yalSQcX/26EExGNCWo=
+github.com/eyedeekay/zerobundle v0.0.0-20200822030320-56c6bd77f723/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
+github.com/eyedeekay/zerobundle v0.0.0-20200822042922-d7ea80e6232b h1:8sLM7g5XwaWbcTM7CYqHCU7JGRiYSEmtVGpxUtgQ4qI=
+github.com/eyedeekay/zerobundle v0.0.0-20200822042922-d7ea80e6232b/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
+github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15 h1:o8btYu9FRR5xBnsRvpoX28ii4emNbLPZ5mx1+LUL37k=
+github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
 github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200801165455-baeb0e58fc5a h1:YB1v+KkQusKKe7UjXIV2vI87okJXmBC7UHjnY6BkL04=
 github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729142507-09254e0fcd4a h1:1DgXjWc4ZXTnC4WGsHY8HAA8QdCrB67+/nZGXTQbIr4=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:NKlWiAbDc3kJWP/G6OhSrqslLlslDCdv7nKoU0GTyxo=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729225350-f5800a7c3c3f h1:swREl2GOW6U1U+RNJfOXWeiKV29yFXKmGCJoKtfRAvU=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:NKlWiAbDc3kJWP/G6OhSrqslLlslDCdv7nKoU0GTyxo=
 github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200801165455-baeb0e58fc5a h1:tRCO7vRlUEBN/RxmUomwAlKQtZ6gtRoDMDyP2fravKI=
 github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:aCWmPFXSHktdhMDHyIxJovmz23UfaQteyh9p7NEMdqk=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729142507-09254e0fcd4a h1:rwMHSafcl+31LFgF3ISBWsDwdpn3bjBir2Ro+61c7ow=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:AuRFy8afdHaiMGYwzYHe5y/zMhR4jAmlVp1pkHnpqK8=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729225350-f5800a7c3c3f h1:cEHhuCYuI0RUPpCnCL5J6TEJ1HFE/+xZUr9Npu/fn3E=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:AuRFy8afdHaiMGYwzYHe5y/zMhR4jAmlVp1pkHnpqK8=
 github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200801165455-baeb0e58fc5a h1:I9cfKFBva/vELjboNMnziXs3yBWAP4efOvpk/2BxRq0=
 github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:E8Mmkic2QrlcHaV75Hjne8f88lDpLNa/x96WEGcdHvA=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729142507-09254e0fcd4a h1:DcnJHPJytYcO3wJuNJsg8mHRh1n1EMbxCNfbdavs0Dc=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:62U7cYEvzk7Ifxw/Ar5v4IuJhIk0tmmtBXzfQ9wvYZk=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729225350-f5800a7c3c3f h1:CF7HMHXP5DOnrXjX4qvUAA1L4duZXiebkUzXls+rGzA=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:62U7cYEvzk7Ifxw/Ar5v4IuJhIk0tmmtBXzfQ9wvYZk=
 github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200801165455-baeb0e58fc5a h1:IKvjrgUqsAFv53gIC8XsanV+tO9m0DbH/qq3yJHmkYU=
 github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:arirCFNWdkg3MySrwkP6kn6iVe2CckYxe8G+hnJRt1E=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729142507-09254e0fcd4a h1:bdiHNCtlUCTTxRD2dx7Na/Rihl4KFZ3pSKKcAFNvQlU=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:MKLWNSl5M4lATW82deXgDyqtLXwkef8qLgQi32iUios=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729225350-f5800a7c3c3f h1:pcG8Ij6x7p2Ipohwx4xhs5s6cOIIjKyW9F0x6HZXJVE=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:MKLWNSl5M4lATW82deXgDyqtLXwkef8qLgQi32iUios=
 github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200801165455-baeb0e58fc5a h1:03H21zmL6cvAn5SON3+pq1Xn15zpnaYWONItSWO8Arg=
 github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:5SG9xD0lwrshQ9vddGUMRhhOg5ckglhFWnuRGCX2oA0=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729142507-09254e0fcd4a h1:ISq9LKIkHsiJBko6QwXlxAO8Fzsxdphip/yWQ0X+FMQ=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:LpDs3WuJeg+W2ovaaaV/zki2+qUw1u8kivAkBrYNn3Y=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729225350-f5800a7c3c3f h1:A0BCGzmYiI7j+0xnznR/oBUd9tlPBxzHbEoC5s6Xz8o=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:LpDs3WuJeg+W2ovaaaV/zki2+qUw1u8kivAkBrYNn3Y=
 github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200801165455-baeb0e58fc5a h1:Tkgc2GkvJxTzt89jeN9vXFRCgYhLgj3l+QFMnXbLiHE=
 github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:qdc81OrWUMbHJh5p6AwnHm/byMu5F37TZ77BL2UuJco=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729142507-09254e0fcd4a h1:g3WOL17K3aWxOaAKp9eg3tgRN54P2YyBpdWFRSfIdDQ=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:F0f897NnR0kBLV6zRIEHp7lhHYzBo2QNG6RhSsm0j8g=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729225350-f5800a7c3c3f h1:HY02d4xi0ikUNOrbbIR+ZL7EgGvIqQHfOztCFa+l2PY=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:F0f897NnR0kBLV6zRIEHp7lhHYzBo2QNG6RhSsm0j8g=
 github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200801165455-baeb0e58fc5a h1:r7vfoe6N3yuZHH0FO2jA8aUAj7C4b9QupBDMCPIFqgw=
 github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:jwWe41RVcOY1vPhdC+k6h5WGI6Zy4AjiyZgioOoglGo=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729142507-09254e0fcd4a h1:Fa6fCH5UJCBEZEvCHNM7mAVH1/XkUkEeD/TyYbeRcyA=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:LQQiw6dlpSNb9vQFLHqOWUSGsNuPulqet/gLzgntWKk=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729225350-f5800a7c3c3f h1:iTjw3qHSXRs4s6v21eKw5TFBn/jamxivITVUnld/TWQ=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:LQQiw6dlpSNb9vQFLHqOWUSGsNuPulqet/gLzgntWKk=
 github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200801165455-baeb0e58fc5a h1:Jfu5QObHI0BLhKi9Hudu1MTjfLuccyC6a8WtrVSh1N4=
 github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:dlc63NsWSrDaqa85np61lWEiobbpP/4qhtm/4S4gnZQ=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729142507-09254e0fcd4a h1:T4Cm1uKjtDU4Fly9vaPvOY4sf6VVkaERQhvyALnVnBw=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:HD5UclEN5RPgVQ2Ba/RdNWhtQ1d12Gx72CKksezEdhc=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729225350-f5800a7c3c3f h1:OiWtQwfYKwrXJRXdaug/KZ49wKRpfCWQA6trHpo57Oo=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:HD5UclEN5RPgVQ2Ba/RdNWhtQ1d12Gx72CKksezEdhc=
 github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200801165455-baeb0e58fc5a h1:LP1ZIS5T4drVnKunx/jTsS5ehaEqs0YW6ypJKPfKaVQ=
 github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:UWWZyb/ESoEsNduVilUxMj4DJ2kn8ldJL5E2gy2IPV8=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729142507-09254e0fcd4a h1:AITYqhm/b9RCxeCvRWFx8lu2Ds8FeII63hbNF7JvnIM=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:oX+vQpNrt5jVdJwdFD+kVMDNfYpRNCB8E8me6xOrqos=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729225350-f5800a7c3c3f h1:jkwvPJhQg1SBE65G4D905Cjvl6uRIkM0UhowGzRo+LE=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:oX+vQpNrt5jVdJwdFD+kVMDNfYpRNCB8E8me6xOrqos=
 github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200801165455-baeb0e58fc5a h1:sQq48QEVd4AJ0jdA+fpPG/7eSn6G3LK9v53YOA01omg=
 github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:PTleyTXt8iqQtqp00m7DojOP/O9CD4B0ep5zTHJxiCc=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729142507-09254e0fcd4a h1:+aFtyD7v1mfjtuqdBDwPV0wA31GSB3l+BSkYL3l1xZk=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:uUp6ltyxP5+9AD4A+ythEBdkglMRkhgGV8SM+eXZqTw=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729225350-f5800a7c3c3f h1:jqfyCNiR8ZsYrtzBMrJeNRPzxshV2NRo2a1KX5SQ52A=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:uUp6ltyxP5+9AD4A+ythEBdkglMRkhgGV8SM+eXZqTw=
 github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200801165455-baeb0e58fc5a h1:7cERcjt6rArcqrL2I36LN/wYF/gWFH3r8pCOL/Ytmxk=
 github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:3hUQinkmOKFMCBur/VjKTMSsFU9Q5R6vpDttyLpXDTA=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729142507-09254e0fcd4a h1:h+8wlDouDmrZW2NZwRy5UaHAewkZps4KYpJs5bZljo0=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:lZDRMeWc47sspGEW0wOGtUqEh+WWA2z5GGTCEFgddVI=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729225350-f5800a7c3c3f h1:b1OxCdkxZq3altokLgnTImPGwUwIwdASUlkKGRoYAe4=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:lZDRMeWc47sspGEW0wOGtUqEh+WWA2z5GGTCEFgddVI=
 github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200801165455-baeb0e58fc5a h1:Un1Yacddsyd8zF8ZhOn4BltbjqLcXIfhBc6xo6lHcpU=
 github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:9FNKW4YG3sCm/UyMa4ZpYUJFA4K1xdMXN0bl7xwt5HE=
 github.com/frankban/quicktest v1.4.0 h1:rCSCih1FnSWJEel/eub9wclBSqpF2F/PuvxUWGWnbO8=
@ -360,7 +288,6 @@ github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1w
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
 github.com/mholt/archiver/v3 v3.3.0 h1:vWjhY8SQp5yzM9P6OJ/eZEkmi3UAbRrxCq48MxjAzig=
 github.com/mholt/archiver/v3 v3.3.0/go.mod h1:YnQtqsp+94Rwd0D/rk5cnLrxusUBUXg+08Ebtr1Mqao=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@ -371,24 +298,19 @@ github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pelletier/go-toml v1.0.1-0.20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU=
-github.com/pierrec/lz4 v1.0.1 h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
 github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v3 v3.3.2 h1:QTUOCbMNDbK4PYtkuHyOBd28C0UhPBw3T4OH4WpFDik=
-github.com/pierrec/lz4/v3 v3.3.2/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
@ -399,7 +321,6 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
-github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8=
 github.com/sger/go-hashdir v0.0.1 h1:ii/IIGYNJCpvSqTV63LbfASPpQqazRRS9ErvmBAUNw0=
 github.com/sger/go-hashdir v0.0.1/go.mod h1:LmCpMSJQKVSNBt2rFKz/upjHTGfwNxn5MAmIAUd4qXg=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
@ -422,6 +343,7 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M=
 github.com/tfriedel6/canvas v0.9.2/go.mod h1:O1YsCm9agdCl48M82l/1tUszUh1nR5zfpLcHxM5D7Cw=
@ -442,9 +364,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMx
 github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE=
 github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26 h1:E0lEWrifmR0ACbGf5PLji1XbW6rtIXLHCXO/YOqi0AE=
 github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26/go.mod h1:TQpdgg7I9+PFIkatlx/dnZyZb4iZyCUx1HJj4rXi3+E=
-github.com/zserge/lorca v0.1.8/go.mod h1:gTrVdXKyWxNhc8aUb1Uu3s0mY343arR1T6jUtxmBxR8=
-github.com/zserge/lorca v0.1.9 h1:vbDdkqdp2/rmeg8GlyCewY2X8Z+b0s7BqWyIQL/gakc=
-github.com/zserge/lorca v0.1.9/go.mod h1:bVmnIbIRlOcoV285KIRSe4bUABKi7R7384Ycuum6e4A=
 github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb/go.mod h1:a1CV8KR4Dd1eP2g+mEijGOp+HKczwdKHWyx0aPHKvo4=
 gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a/go.mod h1:JT4uoTz0tfPoyVH88GZoWDNm5NHJI2VbUW+eyPClueI=
 gitlab.com/golang-commonmark/linkify v0.0.0-20180917065525-c22b7bdb1179/go.mod h1:Gn+LZmCrhPECMD3SOKlE+BOHwhOYD9j7WT9NUtkCrC8=
@ -473,7 +392,6 @@ golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -517,6 +435,7 @@ golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191126131656-8a8471f7e56d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@ -548,11 +467,13 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/import/chromium.go
+++ b/import/chromium.go
@ -1,4 +1,9 @@
-package main
+package i2pbrowser
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/

 import "github.com/eyedeekay/I2P-Configuration-for-Chromium/lib"

--- a/import/extensions.go
+++ b/import/extensions.go
@ -1,6 +1,11 @@
 //+build generate

-package main
+package i2pbrowser
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/

 var VERSION = "0.75"
 var SNOW_VERSION = "0.2.2"
--- a/import/firefox.go
+++ b/import/firefox.go
@ -0,0 +1,16 @@
+package i2pbrowser
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
+import "github.com/eyedeekay/i2pbrowser/lib"
+
+func firefoxMain() {
+	i2pfirefox.FirefoxMain()
+}
+
+func firefoxLaunch() {
+	i2pfirefox.FirefoxLaunch()
+}
--- a/import/httptunnel.go
+++ b/import/httptunnel.go
@ -1,4 +1,9 @@
-package main
+package i2pbrowser
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/

 import (
 	"github.com/eyedeekay/httptunnel"
--- a/import/import.go
+++ b/import/import.go
@ -0,0 +1,142 @@
+//go:generate go run -tags generate gen.go extensions.go
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
+package i2pbrowser
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"runtime"
+	"time"
+
+	"github.com/eyedeekay/GingerShrew/import"
+	. "github.com/eyedeekay/go-fpw"
+	. "github.com/eyedeekay/i2pbrowser/lib"
+	"github.com/eyedeekay/zerobundle"
+)
+
+type handler struct {
+}
+
+func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	fmt.Fprintf(w, "hello\n")
+	/*In the future, we may use this as a sort of loopback for privately testing the browser
+	fingerprint. At first this will be 100% user-initiated, but it may be useful to query such
+	a service periodically, in order to inform the user when a fingerprint change has occurred
+	and prompt them to potentially re-set their browser to it's original state.
+	for name, headers := range req.Header {
+		for _, h := range headers {
+			fmt.Fprintf(w, "%v: %v\n", name, h)
+		}
+	}*/
+}
+
+func hello() error {
+	server := &http.Server{Addr: "localhost:", Handler: &handler{}}
+
+	go func() {
+		if err := server.ListenAndServe(); err != nil {
+			log.Println(err)
+		}
+	}()
+
+	// Setting up signal capturing
+	//    stop := make(chan os.Signal, 1)
+	//    signal.Notify(stop, os.Interrupt)
+
+	// Waiting for SIGINT (pkill -2)
+	//    <-stop
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := server.Shutdown(ctx); err != nil {
+		log.Println(err)
+	}
+	return nil
+}
+
+func proxyCheck() bool {
+	conn, err := net.Dial("tcp4", "localhost:4444")
+	log.Println("Doing dial check")
+	if err != nil {
+		return false
+	}
+	log.Println("Dial check true, proxy is up")
+	defer conn.Close()
+	return true
+}
+
+func Main() {
+	if err := hello(); err != nil {
+		log.Fatal(err)
+	}
+	chromium := flag.Bool("chromium", false, "use a chromium-based browser instead of a firefox-based browser.")
+	flag.Parse()
+	ARGS = append(ARGS, flag.Args()...)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	if runtime.GOOS == "linux" {
+		if !*chromium {
+			if os.Getenv("FIREFOX_BIN") == "" {
+				if err := gingershrew.UnpackTBZ(GingerDir); err != nil {
+					log.Fatal("Error unpacking embedded browser")
+				} else {
+					os.Setenv("LD_LIBRARY_PATH", filepath.Join(GingerDir, "lib/x86_64-linux-gnu")+","+filepath.Join(GingerDir, "usr/lib/x86_64-linux-gnu"))
+					log.Println("LD_LIBRARY_PATH", filepath.Join(GingerDir, "lib/x86_64-linux-gnu")+","+filepath.Join(GingerDir, "usr/lib/x86_64-linux-gnu"))
+					os.Setenv("FIREFOX_BIN", filepath.Join(GingerDir, "gingershrew", "gingershrew"))
+				}
+			}
+		}
+	} else {
+		if LocateFirefox() == "" {
+			*chromium = true
+		}
+	}
+	if err := WriteI2CPConf(); err != nil {
+		log.Println(err)
+	}
+	if err := zerobundle.ZeroMain(); err != nil {
+		log.Println(err)
+	}
+	time.Sleep(time.Second * 2)
+	if !proxyCheck() {
+		go proxyMain(ctx)
+	}
+	if !*chromium {
+		firefoxMain()
+	} else {
+		chromiumMain()
+	}
+}
+
+func MainNoEmbeddedStuff() {
+	if err := hello(); err != nil {
+		log.Fatal(err)
+	}
+	chromium := false
+	ARGS = append(ARGS, flag.Args()...)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	if LocateFirefox() == "" {
+		chromium = true
+	}
+	if !proxyCheck() {
+		go proxyMain(ctx)
+	}
+	if !chromium {
+		firefoxLaunch()
+	} else {
+		chromiumMain()
+	}
+}
--- a/lib/firefox.go
+++ b/lib/firefox.go
@ -1,5 +1,10 @@
 package i2pfirefox

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 import (
 	"bytes"
 	"fmt"
@ -9,6 +14,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	//	"strings"
 	"syscall"

 	. "github.com/eyedeekay/go-fpw"
@ -86,6 +92,50 @@ func WriteProfile(FS *fs) bool {
 	return firstrun
 }

+func FirefoxLaunch() {
+	firstrun := WriteProfile(FS)
+	prefs := filepath.Join(UserDir, "/user.js")
+	if _, err := os.Stat(prefs); os.IsNotExist(err) {
+		if err := ioutil.WriteFile(prefs, []byte(PREFS), 0644); err == nil {
+			log.Println("wrote", prefs)
+		} else {
+			log.Fatal(err)
+		}
+	}
+	if firstrun {
+		_, ERROR := SecureExtendedFirefox(UserDir, false, EXTENSIONS, EXTENSIONHASHES, ARGS...)
+		if ERROR != nil {
+			log.Fatal(ERROR)
+		}
+		//		defer FIREFOX.Close()
+		//<-FIREFOX.Done()
+	} else {
+		_, ERROR := BasicFirefox(UserDir, false, ARGS...)
+		if ERROR != nil {
+			log.Fatal(ERROR)
+		}
+		//<-FIREFOX.Done()
+		//		defer FIREFOX.Close()
+
+		/*		sigs := make(chan os.Signal, 1)
+				done := make(chan bool, 1)
+
+				signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+
+				go func() {
+					sig := <-sigs
+					fmt.Println()
+					fmt.Println(sig)
+					done <- true
+				}()
+
+				fmt.Println("awaiting signal")
+				<-done
+				fmt.Println("exiting")
+				<-FIREFOX.Done()*/
+	}
+}
+
 func FirefoxMain() {
 	firstrun := WriteProfile(FS)
 	prefs := filepath.Join(UserDir, "/user.js")
--- a/lib/pure.go
+++ b/lib/pure.go
@ -2,6 +2,11 @@

 package i2pfirefox

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 var NOM = "pure"

 var ARGS = []string{
@ -28,6 +33,212 @@ user_pref("network.proxy.socks_port", 4444);                        // [SET] 444
 user_pref("network.proxy.share_proxy_settings", true);              // [SET] [SAFE=true] [PRIV=true] does not actually apply to http, but leave it set anyway so that we preserve the SOCKS option
 user_pref("network.proxy.socks_remote_dns", true);                  // [SET] [SAFE=true] [PRIV=true]
 user_pref("network.proxy.allow_hijacking_localhost", true)			// [SET] [SAFE=true] [PRIV=true] Required for blackholing localhost requests when using anonymous proxies.
+
+
+//These come from pyllyukko user.js.
+/*
+The MIT License (MIT)
+
+Copyright (c) 2016 pyllyukko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+// PREF: Disable Mozilla telemetry/experiments
+// https://wiki.mozilla.org/Platform/Features/Telemetry
+// https://wiki.mozilla.org/Privacy/Reviews/Telemetry
+// https://wiki.mozilla.org/Telemetry
+// https://www.mozilla.org/en-US/legal/privacy/firefox.html#telemetry
+// https://support.mozilla.org/t5/Firefox-crashes/Mozilla-Crash-Reporter/ta-p/1715
+// https://wiki.mozilla.org/Security/Reviews/Firefox6/ReviewNotes/telemetry
+// https://gecko.readthedocs.io/en/latest/browser/experiments/experiments/manifest.html
+// https://wiki.mozilla.org/Telemetry/Experiments
+// https://support.mozilla.org/en-US/questions/1197144
+// https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/internals/preferences.html#id1
+user_pref("toolkit.telemetry.enabled",				false);
+user_pref("toolkit.telemetry.unified",				false);
+user_pref("toolkit.telemetry.archive.enabled",			false);
+user_pref("experiments.supported",				false);
+user_pref("experiments.enabled",				false);
+user_pref("experiments.manifest.uri",				"");
+
+// PREF: Disallow Necko to do A/B testing
+// https://trac.torproject.org/projects/tor/ticket/13170
+user_pref("network.allow-experiments",				false);
+
+// PREF: Disable sending Firefox crash reports to Mozilla servers
+// https://wiki.mozilla.org/Breakpad
+// http://kb.mozillazine.org/Breakpad
+// https://dxr.mozilla.org/mozilla-central/source/toolkit/crashreporter
+// https://bugzilla.mozilla.org/show_bug.cgi?id=411490
+// A list of submitted crash reports can be found at about:crashes
+user_pref("breakpad.reportURL",					"");
+
+// PREF: Disable sending reports of tab crashes to Mozilla (about:tabcrashed), don't nag user about unsent crash reports
+// https://hg.mozilla.org/mozilla-central/file/tip/browser/app/profile/firefox.js
+user_pref("browser.tabs.crashReporting.sendReport",		false);
+user_pref("browser.crashReports.unsubmittedCheck.enabled",	false);
+
+// PREF: Disable FlyWeb (discovery of LAN/proximity IoT devices that expose a Web interface)
+// https://wiki.mozilla.org/FlyWeb
+// https://wiki.mozilla.org/FlyWeb/Security_scenarios
+// https://docs.google.com/document/d/1eqLb6cGjDL9XooSYEEo7mE-zKQ-o-AuDTcEyNhfBMBM/edit
+// http://www.ghacks.net/2016/07/26/firefox-flyweb
+user_pref("dom.flyweb.enabled",					false);
+
+// PREF: Disable the UITour backend
+// https://trac.torproject.org/projects/tor/ticket/19047#comment:3
+user_pref("browser.uitour.enabled",				false);
+
+
+// PREF: Disable collection/sending of the health report (healthreport.sqlite*)
+// https://support.mozilla.org/en-US/kb/firefox-health-report-understand-your-browser-perf
+// https://gecko.readthedocs.org/en/latest/toolkit/components/telemetry/telemetry/preferences.html
+user_pref("datareporting.healthreport.uploadEnabled",		false);
+user_pref("datareporting.healthreport.service.enabled",		false);
+user_pref("datareporting.policy.dataSubmissionEnabled",		false);
+// "Allow Firefox to make personalized extension recommendations"
+user_pref("browser.discovery.enabled",				false);
+
+// PREF: Disable Heartbeat  (Mozilla user rating telemetry)
+// https://wiki.mozilla.org/Advocacy/heartbeat
+// https://trac.torproject.org/projects/tor/ticket/19047
+user_pref("browser.selfsupport.url",				"");
+
+// PREF: Disable Firefox Hello (disabled) (Firefox < 49)
+// https://wiki.mozilla.org/Loop
+// https://support.mozilla.org/t5/Chat-and-share/Support-for-Hello-discontinued-in-Firefox-49/ta-p/37946
+// NOTICE-DISABLED: Firefox Hello requires setting "media.peerconnection.enabled" and "media.getusermedia.screensharing.enabled" to true, "security.OCSP.require" to false to work.
+//user_pref("loop.enabled",		false);
+
+// PREF: Disable Firefox Hello metrics collection
+// https://groups.google.com/d/topic/mozilla.dev.platform/nyVkCx-_sFw/discussion
+user_pref("loop.logDomains",					false);
+
+
+// PREF: Disable "Recommended by Pocket" in Firefox Quantum
+user_pref("browser.newtabpage.activity-stream.feeds.section.topstories",	false);
+
+// PREF: Limit the connection keep-alive timeout to 15 seconds (disabled)
+// https://github.com/pyllyukko/user.js/issues/387
+// http://kb.mozillazine.org/Network.http.keep-alive.timeout
+// https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
+//user_pref("network.http.keep-alive.timeout",			15);
+
+// PREF: Disable prefetching of <link rel="next"> URLs
+// http://kb.mozillazine.org/Network.prefetch-next
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/Link_prefetching_FAQ#Is_there_a_preference_to_disable_link_prefetching.3F
+user_pref("network.prefetch-next",				false);
+
+// PREF: Disable DNS prefetching
+// http://kb.mozillazine.org/Network.dns.disablePrefetch
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/Controlling_DNS_prefetching
+user_pref("network.dns.disablePrefetch",			true);
+user_pref("network.dns.disablePrefetchFromHTTPS",		true);
+
+// PREF: Disable the predictive service (Necko)
+// https://wiki.mozilla.org/Privacy/Reviews/Necko
+user_pref("network.predictor.enabled",				false);
+
+// PREF: Reject .onion hostnames before passing the to DNS
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1228457
+// RFC 7686
+user_pref("network.dns.blockDotOnion",				true);
+
+// PREF: Disable search suggestions in the search bar
+// http://kb.mozillazine.org/Browser.search.suggest.enabled
+user_pref("browser.search.suggest.enabled",			false);
+
+// PREF: Disable "Show search suggestions in location bar results"
+user_pref("browser.urlbar.suggest.searches",			false);
+// PREF: When using the location bar, don't suggest URLs from browsing history
+user_pref("browser.urlbar.suggest.history",			false);
+
+// PREF: Disable SSDP
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1111967
+user_pref("browser.casting.enabled",				false);
+
+// PREF: Disable automatic downloading of OpenH264 codec
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_media-capabilities
+// https://andreasgal.com/2014/10/14/openh264-now-in-firefox/
+user_pref("media.gmp-gmpopenh264.enabled",			false);
+user_pref("media.gmp-manager.url",				"");
+
+
+// PREF: Disable downloading homepage snippets/messages from Mozilla
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_mozilla-content
+// https://wiki.mozilla.org/Firefox/Projects/Firefox_Start/Snippet_Service
+user_pref("browser.aboutHomeSnippets.updateUrl",		"");
+
+// PREF: Never check updates for search engines
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_auto-update-checking
+user_pref("browser.search.update",				false);
+
+// PREF: Disable automatic captive portal detection (Firefox >= 52.0)
+// https://support.mozilla.org/en-US/questions/1157121
+user_pref("network.captive-portal-service.enabled",		false);
+
+/******************************************************************************
+ * SECTION: HTTP                                                              *
+ ******************************************************************************/
+
+// PREF: Disallow NTLMv1
+// https://bugzilla.mozilla.org/show_bug.cgi?id=828183
+user_pref("network.negotiate-auth.allow-insecure-ntlm-v1",	false);
+// it is still allowed through HTTPS. uncomment the following to disable it completely.
+//user_pref("network.negotiate-auth.allow-insecure-ntlm-v1-https",		false);
+
+// PREF: Enable CSP 1.1 script-nonce directive support
+// https://bugzilla.mozilla.org/show_bug.cgi?id=855326
+user_pref("security.csp.experimentalEnabled",			true);
+
+// PREF: Enable Content Security Policy (CSP)
+// https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Introducing_Content_Security_Policy
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
+user_pref("security.csp.enable",				true);
+
+// PREF: Enable Subresource Integrity
+// https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity
+// https://wiki.mozilla.org/Security/Subresource_Integrity
+user_pref("security.sri.enable",				true);
+
+// PREF: DNT HTTP header (disabled)
+// https://www.mozilla.org/en-US/firefox/dnt/
+// https://en.wikipedia.org/wiki/Do_not_track_header
+// https://dnt-dashboard.mozilla.org
+// https://github.com/pyllyukko/user.js/issues/11
+// NOTICE: Do No Track must be enabled manually
+//user_pref("privacy.donottrackheader.enabled",		true);
+
+// PREF: Send a referer header with the target URI as the source
+// https://bugzilla.mozilla.org/show_bug.cgi?id=822869
+// https://github.com/pyllyukko/user.js/issues/227
+// NOTICE: Spoofing referers breaks functionality on websites relying on authentic referer headers
+// NOTICE: Spoofing referers breaks visualisation of 3rd-party sites on the Lightbeam addon
+// NOTICE: Spoofing referers disables CSRF protection on some login pages not implementing origin-header/cookie+token based CSRF protection
+// TODO: https://github.com/pyllyukko/user.js/issues/94, commented-out XOriginPolicy/XOriginTrimmingPolicy = 2 prefs
+user_pref("network.http.referer.spoofSource",			true);
+
+// PREF: Don't send referer headers when following links across different domains (disabled)
+// https://github.com/pyllyukko/user.js/issues/227
+// user_pref("network.http.referer.XOriginPolicy",		2);
+
+
 `

 var EXTENSIONPREFS = `{}`
--- a/lib/pureextensions.go
+++ b/lib/pureextensions.go
@ -2,6 +2,11 @@

 package i2pfirefox

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 var EXTENSIONS = []string{
 	"i2ppb@eyedeekay.github.io.xpi",
 	"uBlock0@raymondhill.net.xpi",
--- a/lib/variant.go
+++ b/lib/variant.go
@ -2,6 +2,11 @@

 package i2pfirefox

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 var ARGS = []string{
 	/*"--example-arg",*/
 }
@ -14,6 +19,210 @@ user_pref("browser.display.use_document_fonts", 0);                 // [SET] [SA
 user_pref("browser.download.forbid_open_with", true);               // whether to allow the 'open with' option when downloading a file
 user_pref("browser.library.activity-stream.enabled", false);        // whether to enable Activity Stream recent Highlights in the Library
 user_pref("network.proxy.allow_hijacking_localhost", true)			// [SET] [SAFE=true] [PRIV=true] Required for blackholing localhost requests when using anonymous proxies.
+
+//These come from pyllyukko user.js.
+/*
+The MIT License (MIT)
+
+Copyright (c) 2016 pyllyukko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+// PREF: Disable Mozilla telemetry/experiments
+// https://wiki.mozilla.org/Platform/Features/Telemetry
+// https://wiki.mozilla.org/Privacy/Reviews/Telemetry
+// https://wiki.mozilla.org/Telemetry
+// https://www.mozilla.org/en-US/legal/privacy/firefox.html#telemetry
+// https://support.mozilla.org/t5/Firefox-crashes/Mozilla-Crash-Reporter/ta-p/1715
+// https://wiki.mozilla.org/Security/Reviews/Firefox6/ReviewNotes/telemetry
+// https://gecko.readthedocs.io/en/latest/browser/experiments/experiments/manifest.html
+// https://wiki.mozilla.org/Telemetry/Experiments
+// https://support.mozilla.org/en-US/questions/1197144
+// https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/internals/preferences.html#id1
+user_pref("toolkit.telemetry.enabled",				false);
+user_pref("toolkit.telemetry.unified",				false);
+user_pref("toolkit.telemetry.archive.enabled",			false);
+user_pref("experiments.supported",				false);
+user_pref("experiments.enabled",				false);
+user_pref("experiments.manifest.uri",				"");
+
+// PREF: Disallow Necko to do A/B testing
+// https://trac.torproject.org/projects/tor/ticket/13170
+user_pref("network.allow-experiments",				false);
+
+// PREF: Disable sending Firefox crash reports to Mozilla servers
+// https://wiki.mozilla.org/Breakpad
+// http://kb.mozillazine.org/Breakpad
+// https://dxr.mozilla.org/mozilla-central/source/toolkit/crashreporter
+// https://bugzilla.mozilla.org/show_bug.cgi?id=411490
+// A list of submitted crash reports can be found at about:crashes
+user_pref("breakpad.reportURL",					"");
+
+// PREF: Disable sending reports of tab crashes to Mozilla (about:tabcrashed), don't nag user about unsent crash reports
+// https://hg.mozilla.org/mozilla-central/file/tip/browser/app/profile/firefox.js
+user_pref("browser.tabs.crashReporting.sendReport",		false);
+user_pref("browser.crashReports.unsubmittedCheck.enabled",	false);
+
+// PREF: Disable FlyWeb (discovery of LAN/proximity IoT devices that expose a Web interface)
+// https://wiki.mozilla.org/FlyWeb
+// https://wiki.mozilla.org/FlyWeb/Security_scenarios
+// https://docs.google.com/document/d/1eqLb6cGjDL9XooSYEEo7mE-zKQ-o-AuDTcEyNhfBMBM/edit
+// http://www.ghacks.net/2016/07/26/firefox-flyweb
+user_pref("dom.flyweb.enabled",					false);
+
+// PREF: Disable the UITour backend
+// https://trac.torproject.org/projects/tor/ticket/19047#comment:3
+user_pref("browser.uitour.enabled",				false);
+
+
+// PREF: Disable collection/sending of the health report (healthreport.sqlite*)
+// https://support.mozilla.org/en-US/kb/firefox-health-report-understand-your-browser-perf
+// https://gecko.readthedocs.org/en/latest/toolkit/components/telemetry/telemetry/preferences.html
+user_pref("datareporting.healthreport.uploadEnabled",		false);
+user_pref("datareporting.healthreport.service.enabled",		false);
+user_pref("datareporting.policy.dataSubmissionEnabled",		false);
+// "Allow Firefox to make personalized extension recommendations"
+user_pref("browser.discovery.enabled",				false);
+
+// PREF: Disable Heartbeat  (Mozilla user rating telemetry)
+// https://wiki.mozilla.org/Advocacy/heartbeat
+// https://trac.torproject.org/projects/tor/ticket/19047
+user_pref("browser.selfsupport.url",				"");
+
+// PREF: Disable Firefox Hello (disabled) (Firefox < 49)
+// https://wiki.mozilla.org/Loop
+// https://support.mozilla.org/t5/Chat-and-share/Support-for-Hello-discontinued-in-Firefox-49/ta-p/37946
+// NOTICE-DISABLED: Firefox Hello requires setting "media.peerconnection.enabled" and "media.getusermedia.screensharing.enabled" to true, "security.OCSP.require" to false to work.
+//user_pref("loop.enabled",		false);
+
+// PREF: Disable Firefox Hello metrics collection
+// https://groups.google.com/d/topic/mozilla.dev.platform/nyVkCx-_sFw/discussion
+user_pref("loop.logDomains",					false);
+
+
+// PREF: Disable "Recommended by Pocket" in Firefox Quantum
+user_pref("browser.newtabpage.activity-stream.feeds.section.topstories",	false);
+
+// PREF: Limit the connection keep-alive timeout to 15 seconds (disabled)
+// https://github.com/pyllyukko/user.js/issues/387
+// http://kb.mozillazine.org/Network.http.keep-alive.timeout
+// https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout
+//user_pref("network.http.keep-alive.timeout",			15);
+
+// PREF: Disable prefetching of <link rel="next"> URLs
+// http://kb.mozillazine.org/Network.prefetch-next
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/Link_prefetching_FAQ#Is_there_a_preference_to_disable_link_prefetching.3F
+user_pref("network.prefetch-next",				false);
+
+// PREF: Disable DNS prefetching
+// http://kb.mozillazine.org/Network.dns.disablePrefetch
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/Controlling_DNS_prefetching
+user_pref("network.dns.disablePrefetch",			true);
+user_pref("network.dns.disablePrefetchFromHTTPS",		true);
+
+// PREF: Disable the predictive service (Necko)
+// https://wiki.mozilla.org/Privacy/Reviews/Necko
+user_pref("network.predictor.enabled",				false);
+
+// PREF: Reject .onion hostnames before passing the to DNS
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1228457
+// RFC 7686
+user_pref("network.dns.blockDotOnion",				true);
+
+// PREF: Disable search suggestions in the search bar
+// http://kb.mozillazine.org/Browser.search.suggest.enabled
+user_pref("browser.search.suggest.enabled",			false);
+
+// PREF: Disable "Show search suggestions in location bar results"
+user_pref("browser.urlbar.suggest.searches",			false);
+// PREF: When using the location bar, don't suggest URLs from browsing history
+user_pref("browser.urlbar.suggest.history",			false);
+
+// PREF: Disable SSDP
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1111967
+user_pref("browser.casting.enabled",				false);
+
+// PREF: Disable automatic downloading of OpenH264 codec
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_media-capabilities
+// https://andreasgal.com/2014/10/14/openh264-now-in-firefox/
+user_pref("media.gmp-gmpopenh264.enabled",			false);
+user_pref("media.gmp-manager.url",				"");
+
+
+// PREF: Disable downloading homepage snippets/messages from Mozilla
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_mozilla-content
+// https://wiki.mozilla.org/Firefox/Projects/Firefox_Start/Snippet_Service
+user_pref("browser.aboutHomeSnippets.updateUrl",		"");
+
+// PREF: Never check updates for search engines
+// https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections#w_auto-update-checking
+user_pref("browser.search.update",				false);
+
+// PREF: Disable automatic captive portal detection (Firefox >= 52.0)
+// https://support.mozilla.org/en-US/questions/1157121
+user_pref("network.captive-portal-service.enabled",		false);
+
+/******************************************************************************
+ * SECTION: HTTP                                                              *
+ ******************************************************************************/
+
+// PREF: Disallow NTLMv1
+// https://bugzilla.mozilla.org/show_bug.cgi?id=828183
+user_pref("network.negotiate-auth.allow-insecure-ntlm-v1",	false);
+// it is still allowed through HTTPS. uncomment the following to disable it completely.
+//user_pref("network.negotiate-auth.allow-insecure-ntlm-v1-https",		false);
+
+// PREF: Enable CSP 1.1 script-nonce directive support
+// https://bugzilla.mozilla.org/show_bug.cgi?id=855326
+user_pref("security.csp.experimentalEnabled",			true);
+
+// PREF: Enable Content Security Policy (CSP)
+// https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Introducing_Content_Security_Policy
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
+user_pref("security.csp.enable",				true);
+
+// PREF: Enable Subresource Integrity
+// https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity
+// https://wiki.mozilla.org/Security/Subresource_Integrity
+user_pref("security.sri.enable",				true);
+
+// PREF: DNT HTTP header (disabled)
+// https://www.mozilla.org/en-US/firefox/dnt/
+// https://en.wikipedia.org/wiki/Do_not_track_header
+// https://dnt-dashboard.mozilla.org
+// https://github.com/pyllyukko/user.js/issues/11
+// NOTICE: Do No Track must be enabled manually
+//user_pref("privacy.donottrackheader.enabled",		true);
+
+// PREF: Send a referer header with the target URI as the source
+// https://bugzilla.mozilla.org/show_bug.cgi?id=822869
+// https://github.com/pyllyukko/user.js/issues/227
+// NOTICE: Spoofing referers breaks functionality on websites relying on authentic referer headers
+// NOTICE: Spoofing referers breaks visualisation of 3rd-party sites on the Lightbeam addon
+// NOTICE: Spoofing referers disables CSRF protection on some login pages not implementing origin-header/cookie+token based CSRF protection
+// TODO: https://github.com/pyllyukko/user.js/issues/94, commented-out XOriginPolicy/XOriginTrimmingPolicy = 2 prefs
+user_pref("network.http.referer.spoofSource",			true);
+
+// PREF: Don't send referer headers when following links across different domains (disabled)
+// https://github.com/pyllyukko/user.js/issues/227
+// user_pref("network.http.referer.XOriginPolicy",		2);
+
 `

 var EXTENSIONPREFS = `{}`
--- a/lib/variantextensions.go
+++ b/lib/variantextensions.go
@ -2,6 +2,11 @@

 package i2pfirefox

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 var NOM = "variant"

 var EXTENSIONS = []string{
--- a/licenses/BSD3-i2p-zero
+++ b/licenses/BSD3-i2p-zero
@ -0,0 +1,236 @@
+BSD 3-Clause License
+
+Copyright (c) 2019 The Monero Project
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Includes OpenSans-Regular font, licensed as follows:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
--- a/licenses/GPL3-icecat
+++ b/licenses/GPL3-icecat
@ -0,0 +1,699 @@
+
+NOTE: This bundle only contains the set of scripts that programatically
+  make IceCat from Mozilla Firefox. The resultant IceCat program retains
+  the same license as Firefox itself, the Mozilla Public License 2.0
+
+NOTE 2: Extensions bundled with IceCat are contain their own Copyright
+  and license notices and are not covered by this file.
+
+  Copyright (C) 2014, 2015 Ruben Rodriguez <ruben@gnu.org>
+  Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012, 2014, 2015 Free Software Foundation
+
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+---------------------------------------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
--- a/licenses/MPL2-mozilla
+++ b/licenses/MPL2-mozilla
@ -0,0 +1,374 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
+
--- a/main.go
+++ b/main.go
@ -1,111 +1,16 @@
 //go:generate go run -tags generate gen.go extensions.go

+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
 package main

 import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
-
-	. "github.com/eyedeekay/GingerShrew/import"
-	. "github.com/eyedeekay/go-fpw"
-	. "github.com/eyedeekay/i2pfirefox/lib"
-	"github.com/eyedeekay/zerobundle"
+	. "github.com/eyedeekay/i2pbrowser/import"
 )

-type handler struct {
-}
-
-func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	fmt.Fprintf(w, "hello\n")
-	/*In the future, we may use this as a sort of loopback for privately testing the browser
-	fingerprint. At first this will be 100% user-initiated, but it may be useful to query such
-	a service periodically, in order to inform the user when a fingerprint change has occurred
-	and prompt them to potentially re-set their browser to it's original state.
-	for name, headers := range req.Header {
-		for _, h := range headers {
-			fmt.Fprintf(w, "%v: %v\n", name, h)
-		}
-	}*/
-}
-
-func hello() error {
-	server := &http.Server{Addr: "localhost:", Handler: &handler{}}
-
-	go func() {
-		if err := server.ListenAndServe(); err != nil {
-			log.Println(err)
-		}
-	}()
-
-	// Setting up signal capturing
-	//    stop := make(chan os.Signal, 1)
-	//    signal.Notify(stop, os.Interrupt)
-
-	// Waiting for SIGINT (pkill -2)
-	//    <-stop
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	if err := server.Shutdown(ctx); err != nil {
-		log.Println(err)
-	}
-	return nil
-}
-
-func proxyCheck() bool {
-	conn, err := net.Dial("tcp4", "localhost:4444")
-	log.Println("Doing dial check")
-	if err != nil {
-		return false
-	}
-	log.Println("Dial check true, proxy is up")
-	defer conn.Close()
-	return true
-}
-
 func main() {
-	if err := hello(); err != nil {
-		log.Fatal(err)
-	}
-	chromium := flag.Bool("chromium", false, "use a chromium-based browser instead of a firefox-based browser.")
-	flag.Parse()
-	ARGS = append(ARGS, flag.Args()...)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	if runtime.GOOS == "linux" {
-		if !*chromium {
-			if err := UnpackTBZ(GingerDir); err != nil {
-				log.Fatal("Error unpacking embedded browser")
-			} else {
-				os.Setenv("FIREFOX_BIN", filepath.Join(GingerDir, "gingershrew", "gingershrew"))
-			}
-		}
-	} else {
-		if LocateFirefox() == "" {
-			*chromium = true
-		}
-	}
-	if err := WriteI2CPConf(); err != nil {
-		log.Println(err)
-	}
-	if err := zerobundle.ZeroMain(); err != nil {
-		log.Println(err)
-	}
-	time.Sleep(time.Second * 2)
-	if !proxyCheck() {
-		go proxyMain(ctx)
-	}
-	if !*chromium {
-		firefoxMain()
-	} else {
-		chromiumMain()
-	}
+	Main()
 }
Author	SHA1	Message	Date
idk	491b3d37f3	update gs	2020-09-09 21:17:43 -04:00
idk	cc8e85c89c	Allow Firefox to break completely free of the Go app should the dev choose to do so	2020-09-06 17:41:59 -04:00
idk	d7055ec1f4	make it possible to just import it and use it in another app	2020-09-06 16:55:22 -04:00
idk	3d5c7fe9c1	bump	2020-08-24 00:54:46 -04:00
idk	a740c15292	bump	2020-08-24 00:46:57 -04:00
idk	d09c1e2514	bump	2020-08-23 23:26:14 -04:00
idk	607013b805	pre-load a libc for gingershrew	2020-08-23 00:54:33 -04:00
idk	56a5baade0	Make release version 116.0.73.097	2020-08-22 02:23:26 -04:00
idk	cb1740cf11	Make release version 116.0.73.096	2020-08-21 23:33:32 -04:00
idk	dbb2c0e879	change module name	2020-08-21 17:27:33 -04:00
idk	6de746da50	change module name	2020-08-21 17:26:02 -04:00
idk	3df0f23b68	change module name	2020-08-21 17:22:20 -04:00
idk	58ac124c6b	move licenses	2020-08-21 17:21:18 -04:00
idk	0e7614afcc	Improve release automation	2020-08-21 17:20:55 -04:00
idk	5ba550b39d	Make release version 116.0.73.095	2020-08-21 17:11:49 -04:00
idk	d4d2beef0c	Improve release automation	2020-08-21 16:35:54 -04:00
idk	de4d71ab34	Improve release automation	2020-08-21 15:27:05 -04:00
idk	5403f75b84	check in licenses	2020-08-21 15:18:34 -04:00
idk	9e141c7507	check in licenses	2020-08-21 15:14:02 -04:00
idk	0d9e69d702	update readme	2020-08-21 13:15:25 -04:00
idk	a75320f9af	update to working version of zerobundle for windows	2020-08-21 11:39:16 -04:00
idk	031eaff570	update download paths	2020-08-05 22:35:08 -04:00
idk	91882af901	update download paths	2020-08-05 22:33:33 -04:00
idk	5dd2bfb80b	bump version and release	2020-08-05 16:05:53 -04:00
idk	b0c0e0f036	update README some more	2020-08-04 01:48:09 -04:00
idk	fec41e6429	update README some more	2020-08-04 01:12:18 -04:00