clone i2p.i2p to depth=1

shellcheck torbrowser.sh script
pack a recent TBB into the linux portable just in case
2022-10-08 13:14:04 -04:00 · 2022-10-01 22:30:11 -04:00 · 2022-10-01 22:05:58 -04:00 · 2022-10-01 22:00:58 -04:00 · 2022-10-01 21:28:00 -04:00 · 2022-10-01 21:06:48 -04:00
128 changed files with 14105 additions and 1201 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,24 @@
 build
 *.deb
 *.tgz
-I2P-Profile-Installer-0.03.exe
+./I2P/
 I2P/
-router.info
-router.keys.dat
+i2pversion_override
+*.crl
+*.crt
+*.pem
+*.p12
+.stfolder
+*.url
+.vscode
+.version
+*.su3
+*.su3.torrent
+*.exe
+*.log
+cmd
+*.so
+*.jar
+*.zip
+*.tar.gz
+config_override.sh
--- a/.nojekyll
+++ b/.nojekyll
--- a/HTTPSEverywhere.url
+++ b/HTTPSEverywhere.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3716461/2021.4.15/https_everywhere-2021.4.15-an+fx.xpi
--- a/LICENSE.html
+++ b/LICENSE.html
@ -0,0 +1,129 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+  </head>
+  <body>
+    <div id="navbar">
+      <a href="#shownav">
+        Show navigation
+      </a>
+      <div id="shownav">
+        <div id="hidenav">
+          <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
+            <li>
+              <a href="index.html">
+                index
+              </a>
+            </li>
+            <li>
+              <a href="LICENSE.html">
+                LICENSE
+              </a>
+            </li>
+            <li>
+              <a href="UPDATES.html">
+                UPDATES
+              </a>
+            </li>
+          </ul>
+          <br>
+          <a href="#hidenav">
+            Hide Navigation
+          </a>
+        </div>
+      </div>
+    </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
+    <p>
+      Copyright 2018
+    </p>
+    <p>
+      Permission is hereby granted, free of charge, to any person obtaining a copy of
+      this software and associated documentation files (the &ldquo;Software&rdquo;), 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:
+    </p>
+    <p>
+      The above copyright notice and this permission notice shall be included in all
+      copies or substantial portions of the Software.
+    </p>
+    <p>
+      THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, 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.
+    </p>
+    <div id="sourcecode">
+      <span id="sourcehead">
+        <strong>
+          Get the source code:
+        </strong>
+      </span>
+      <ul>
+        <li>
+          <a href="https://github.com/eyedeekay/i2p.firefox">
+            Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <a href="#show">
+        Show license
+      </a>
+      <div id="show">
+        <div id="hide">
+          <pre><code>Copyright 2018
+
+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.
+</code></pre>
+          <a href="#hide">
+            Hide license
+          </a>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>
--- a/256
+++ b/256
@ -1,37 +1,94 @@
-all: install.exe
+-include i2pversion
+-include i2pversion_override

-prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config
+-include config.mk
+
+preset=`rm .version; make version`
+
+-include .version
+
+PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
+
+all: version prep install.exe
+
+tag:
+	git tag $(PROFILE_VERSION)
+
+version:
+	echo !define VERSIONMAJOR $(VERSIONMAJOR) > src/nsis/i2pbrowser-version.nsi
+	echo !define VERSIONMINOR $(VERSIONMINOR) >> src/nsis/i2pbrowser-version.nsi
+	echo !define VERSIONBUILD $(VERSIONBUILD) >> src/nsis/i2pbrowser-version.nsi
+	sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
+	rm -f version.txt
+	make version.txt i2pbrowser-jpackage.nsi
+
+version.txt:
+	echo "$(PROFILE_VERSION)" > src/profile/version.txt
+	echo "$(PROFILE_VERSION)" > src/app-profile/version.txt
+
+i2pbrowser-jpackage.nsi:
+	echo "!define I2P_VERSION $(PROFILE_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi
+
+jpackage: version I2P build/I2P/config all
+
+help: version
+	@echo "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)"
+	@echo "$(SIGNER)"
+	@echo "$(I2P_VERSION)"
+	@echo "$(MAJOR).$(MINOR).$(BUILD)"
+	@echo "$(preset)"
+
+prep: #launchers build/licenses profile.tgz app-profile.tgz profile build/I2P build/I2P/config #
+	make build/licenses
+	echo "licenses" >make.log
+	make build/I2P
+	echo "buildi2p" >make.log
+	make build/I2P/config
+	echo "buildi2pconfig" >make.log
 	cp src/nsis/*.nsi build
+	echo "nsi1" >make.log
 	cp src/nsis/*.nsh build
+	echo "nsi2" >make.log
 	cp src/icons/*.ico build

-install.exe: prep
-	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
+install.exe: #build/licenses
+	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"

-export RES_DIR="../i2p.i2p/installer/resources"
-export PKG_DIR="../i2p.i2p/pkg-temp"
+export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
+export PKG_DIR="../i2p.i2p.jpackage-build/pkg-temp"
+export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"

-build/I2P: build
+distclean: clean
+	rm -rf I2P
+
+I2P:
+	./build.sh
+
+build/I2P: I2P build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
-
-configdir: src/I2P/config
+	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true

 src/I2P/config:
+	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
-	echo true | tee src/I2P/config/jpackaged ; true
-	cp $(RES_DIR)/clients.config src/I2P/config/ ; true
-	cp $(RES_DIR)/i2ptunnel.config src/I2P/config/ ; true
-	cp $(RES_DIR)/wrapper.config src/I2P/config/ ; true
-	cp $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt ; true
-	cp -R $(RES_DIR)/certificates src/I2P/config/certificates ; true
-	mkdir -p src/I2P/config/geoip ; true
-	cp $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz ; true
-	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps ; true
-	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../.. ; true
+	cp -v $(RES_DIR)/clients.config src/I2P/config/
+	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
+	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
+	cat router.config > src/I2P/config/router.config
+	cat i2ptunnel.config > src/I2P/config/i2ptunnel.config
+	cp -v $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt
+	cp -R $(RES_DIR)/certificates src/I2P/config/certificates
+	cp -R $(RES_DIR)/eepsite src/I2P/config/eepsite
+	mkdir -p src/I2P/config/geoip
+	cp -v $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz
+	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
+	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..

-build/I2P/config: build/I2P
-	cp -rv src/I2P/config build/I2P/config ; true
+build/I2P/config: src/I2P/config build/I2P
+	cp -rv src/I2P/config build/I2P/config
+#	cp -rv build/I2P/* I2P/
+#	cp -rv src/I2P/config build/I2P/.i2p

 #
 # Warning: a displayed license file of more than 28752 bytes
@ -42,146 +99,57 @@ build/licenses: build
 	mkdir -p build/licenses
 	cp license/* build/licenses
 	cp LICENSE.md build/licenses/MIT.txt
-	unix2dos build/licenses/LICENSE.index
+	cat build/licenses/LICENSE.index \
+		build/licenses/EPL.txt \
+		build/licenses/GPL+CLASSPATH.txt \
+		build/licenses/HTTPS-Everywhere.txt \
+		build/licenses/LICENSE.tor \
+		build/licenses/MIT.txt \
+		build/licenses/MPL2.txt \
+		build/licenses/NoScript.txt \
+		build/licenses/NSS.txt \
+		build/licenses/I2P.txt > build/licenses/LICENSE.txt
+	unix2dos build/licenses/LICENSE.txt

 clean:
-	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb
+	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Easy-Install-Bundle-*.exe *.deb src/I2P/config *.su3 .version *.url make.log
+	git clean -fdx src build

 build:
 	@echo "creating build directory"
 	mkdir -p build

-profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+include makefiles/su.mk

-profile.tgz: profile
-	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
-	@echo "building profile tarball $(PROFILE_VERSION)"
-	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
-	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
+include makefiles/su-unsigned.mk

-build/profile/user.js: build/profile src/profile/user.js
-	cp src/profile/user.js build/profile/user.js
+include makefiles/debian.mk

-build/profile/prefs.js: build/profile src/profile/prefs.js
-	cp src/profile/prefs.js build/profile/prefs.js
+I2P_DATE=`date +%Y-%m-%d`

-build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
-	cp src/profile/bookmarks.html build/profile/bookmarks.html
+MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`

-build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
-	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
+BLANK=`awk '! NF { print NR; exit }' changelog.txt`

-copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
-	cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi
+I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip

-app-profile: build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
+I2P-jpackage-windows-$(I2P_VERSION).zip:
+	sh -c 'powershell Compress-Archive I2P I2P-jpackage-windows-$(I2P_VERSION).zip || zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P'

-app-profile.tgz: app-profile
-	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
-	@echo "building app-profile tarball $(PROFILE_VERSION)"
-	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
-	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
+changelog:
+	head -n "$(BLANK)" changelog.txt

-build/app-profile/user.js: build/app-profile src/app-profile/user.js
-	cp src/app-profile/user.js build/app-profile/user.js
+release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
+	head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true

-build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
-	cp src/app-profile/prefs.js build/app-profile/prefs.js
+update-release-jpackage:
+	head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true

-build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
-	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
+delete-release-jpackage:
+	gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true

-build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
-	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
+upload-release-jpackage:
+	gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"

-build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
-	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
-
-copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
-	cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
-
-build/i2ppb@eyedeekay.github.io.xpi:
-	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
-
-build/NoScript.xpi: NoScript.url
-	curl -L `cat NoScript.url` > build/NoScript.xpi
-
-build/HTTPSEverywhere.xpi : HTTPSEverywhere.url
-	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
-
-clean-extensions:
-	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url
-
-extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url
-
-HTTPSEverywhere.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3716461/"`./amo-version.sh https-everywhere`"/https_everywhere-"`./amo-version.sh https-everywhere`"-an+fx.xpi" > HTTPSEverywhere.url
-
-NoScript.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url
-
-i2psetproxy.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3674169/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
-
-build/profile/extensions: build/profile
-	mkdir -p build/profile/extensions
-
-build/profile: build
-	mkdir -p build/profile
-	
-
-build/app-profile/chrome: build/app-profile
-	mkdir -p build/app-profile/chrome
-	
-build/app-profile/extensions: build/app-profile
-	mkdir -p build/app-profile/extensions
-
-build/app-profile: build
-	mkdir -p build/app-profile
-
-install:
-	rm -rfv /etc/i2pbrowser \
-		/var/lib/i2pbrowser
-	mkdir -p /etc/i2pbrowser \
-		/var/lib/i2pbrowser
-	install -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
-	install -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
-	install -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
-	install -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
-	install -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
-	cp -vr build/profile /var/lib/i2pbrowser/profile
-	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
-	cp -vr src/icons /var/lib/i2pbrowser/icons
-	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
-	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
-
-uninstall:
-	rm -rfv /etc/i2pbrowser \
-		/var/lib/i2pbrowser \
-		/etc/i2pbrowser/i2pbrowserrc \
-		/usr/local/bin/i2pbrowser \
-		/usr/local/bin/i2pconfig \
-		/usr/local/bin/i2p-config-service-setup \
-		/usr/share/applications/i2pbrowser.desktop \
-		/usr/share/applications/i2pconfig.desktop
-
-checkinstall:
-	checkinstall \
-		--default \
-		--install=no \
-		--fstrans=yes \
-		--pkgname=i2p-firefox \
-		--pkgversion=$(PROFILE_VERSION) \
-		--pkggroup=net \
-		--pkgrelease=1 \
-		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
-		--maintainer="hankhill19580@gmail.com" \
-		--requires="firefox,wget,i2p,i2p-router" \
-		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
-		--nodoc \
-		--deldoc=yes \
-		--deldesc=yes \
-		--backup=no
+jpackage-release: release-jpackage upload-release-jpackage
--- a/NoScript.url
+++ b/NoScript.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.8/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
--- a/README.md
+++ b/README.md
@ -1,93 +1,241 @@
-I2P Browsing Profile for Firefox
-================================
+I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
+==================================================================================

 Features:
 ---------

- - Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
- - Automatically configure a profile for I2P
- - Automatically block-list all non-I2P local destinations
- - Enable first-party isolation, anti-fingerprinting, letterboxing
- - Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
+- Automatically select an up-to-date, secure browser from the host platform, with Tor Browser and Firefox preferred.
+- Automatically configure a profile for I2P
+- Automatically block-list all non-I2P local destinations
+- Enable first-party isolation, anti-fingerprinting, letterboxing, fusion, other privacy and security options
+- Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores

 Build Dependencies:
 -------------------

-To build this, you will need the following software packages (all available in Debian) :
+To build this, you will need the following software packages
+(all available in Debian and Ubuntu, see WSL section below):

- * make
- * nsis
- * dos2unix
- * curl
+- make
+- nsis
+- dos2unix
+- curl
+- jq

-to build a Debian package, you'll also need
+These need to be installed in the environment where the NSIS
+Package is build, NOT the environment where the java package
+is built. These may be different, because you will need to
+use a system which provides a Unix-like environment on top of
+a Windows system. You can use WSL or Cygwin, and more detailed
+instructions are provided below.

- * checkinstall
+Building for Windows target from Linux is not possible unless
+you obtain a Windows package from my github.

-Preparation
-----------
+In addition, you will need the NSIS plugin "ShellExecAsUser" which you can get from the
+[NSIS Wiki Page](https://nsis.sourceforge.io/ShellExecAsUser_plug-in). In order to install
+the plugin on Debian, Ubuntu, or using `WSL`, you can download the: [7zip release](https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z)
+and copy the content of `Plugins` to `/usr/share/nsis/Plugins`.

-Before you build, run the targets
+```sh
+cp -rv Plugins/* /usr/share/nsis/Plugins/
+```

+Including a jpackaged I2P Router
+--------------------------------

-        make clean-extensions
-        make extensions
+**Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
+with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
+your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
+environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
+Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows,
+you should select "Checkout as is, commit as is" and leave line-endings alone.

-to update the extensions to point to their latest versions.
+The Windows build tools listed above must be installed on the Windows host machine.
+
+TODO: Add links to the respective instructions for each of these.
+
+**Note that after the dependencies are installed, this step is automated**
+**with `./build.sh`.**
+
+In order to include a jpackaged(dependency-free) I2P router in the Profile
+Bundle you will need to build the jpackaged I2P router as an "App Image" on
+a Windows system and place it into a directory called `I2P` in your `i2p.firefox`
+checkout. Building without a jpackage is no longer supported.
+
+Assuming a working java and jpackage environment on your Windows system, the
+following command should generate a suitable "App Image" in a directory
+called "I2P."
+
+        export I2P_VERSION=0.9.49
+        cp -R ../i2p.i2p/pkg-temp/lib build/lib
+        jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+          --verbose \
+          --resource-dir build/lib \
+          --input build/lib --main-jar router.jar --main-class net.i2p.router.RouterLaunch
+
+Transfer the I2P directory to the machine where you build i2p.firefox if
+necessary, then complete the regular build instructions. If a jpackaged I2P router
+isn't present to use at build time, the inclusion will be skipped automatically
+with a non-fatal warning.
+
+Pre-built app-images are available from my daily releases at:
+
+        https://github.com/eyedeekay/i2p.plugins.firefox/releases/

 Windows Build
 -------------

 After installing the dependencies and completing the preparations,
-just run `make`.  This will produce three files:
+just run `make`.  This will produce the install.exe - the windows
+installer, which sets up the shortcuts to launch Firefox on Windows.
+Building without a jpackage is no longer supported.

-profile.tgz - the firefox profile, plus a shell script which will
-launch it if Firefox is found in the $PATH on Unix-Like operating
-systems.
-app-profile.tgz - the Firefox profile plus a launcher shell script,
-which will launch a *modified* Firefox without a URL bar as a router
-console wrapper.
-install.exe - the windows installer, which sets up shortcuts to
-launch Firefox on Windows.
+When generating a build it's important to make sure that the
+licenses for all the bundled softare are included. This should happen
+automatically. When bundling software, describe the terms and where
+they are applied in the `LICENSE.index`, then add the full license
+to the `licenses` directory. Then, add the full license to the `cat`
+command in the `build/licenses` make target. The build/licenses
+target is run automatically during the build process.
+
+End-to-End Windows build process using WSL(**Recommended**)
+-----------------------------------------------------------
+
+**See `config.sh` and `i2pversion` for instructions on how to tweak**
+**the build process. File an issue if you need help.**
+
+**If you've already done this once, you can just use:** `./unsigned.sh`
+**in `git bash`** to automatically build an installer. If you
+are using this method, you may use the `makensis` and `make` from
+Ubuntu in WSL.
+
+ 1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps)
+ 2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71)
+ 3. Open Git Bash.
+ 4. Install prerequisites `wsl sudo apt-get update && sudo apt-get install make nsis nsis-pluginapi dos2unix curl jq`
+ 5. Clone `i2p.i2p` and `i2p.firefox`
+
+        git clone https://github.com/i2p/i2p.i2p
+        git clone https://github.com/i2p/i2p.firefox
+
+ 6. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+  inside i2p.i2p. Return to home.
+
+        cd i2p.i2p
+        ant clean pkg
+        cd ..
+
+ 7. Move into the i2p.firefox directory. Run the `./build.sh` script.
+
+        cd i2p.firefox
+        ./build.sh
+
+ 8. Compile the NSIS installer using WSL.
+
+        wsl make
+
+End-to-End Windows build process using Cygwin(More difficult than WSL for now)
+------------------------------------------------------------------------------
+
+I highly recommend you look into the Chocolatey package manager, which makes it much
+easier to configure these tools and keep them up to date.
+
+**Prerequisites:** In addition to the other prerequisites, you will need to to have
+`make` installed with `cygwin`. If you are using this method, you cannot use the
+automated build scripts without a hack. You will need to create a file called `wsl`
+in a place that is in the path used by `git-bash.exe` sessions, with the content:
+
+```
+#! /usr/bin/env bash
+$@
+```
+
+For our purposes, as long as everything else is set up and you're using git bash,
+that is enough to make the scripts compatible with `cygwin`. Cygwin builds without
+git bash are not likely to work.
+
+1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages. Select the `make` `jq` `dos2unix` and `curl` packages.
+2. Open a cygwin terminal.
+3. Clone `i2p.i2p` and `i2p.firefox`
+
+        git clone https://github.com/i2p/i2p.i2p
+        git clone https://github.com/i2p/i2p.firefox
+
+4. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+  inside i2p.i2p. Return to home.
+
+        cd i2p.i2p
+        ant clean pkg
+        cd ..
+
+5. Move into the i2p.firefox directory. Run the `./build.sh` script.
+
+        cd i2p.firefox
+        ./build.sh
+
+6. Run `make` to build the installer.
+
+Doing a Release
+---------------
+
+Once you have the installer `.exe` file produced by NSIS, you're almost ready to
+do a release. As a final step, someone must sign the `.exe` file using a
+Certificate which Windows will recognize. The current signer of the Windows
+bundle is Zlatinb. Standard Windows signing tools are used.
+
+```sh
+./release.sh
+```
+
+produces the binary.
+
+Building a signed update file
+-----------------------------
+
+Building a signed update file for automatically updating a Windows I2P router
+requires you to either be using linux, or have Go installed in your Cygwin or WSL environment.
+On Linux(Where I sign the su3 files), this works:
+
+        make su3
+
+to run the signing tool if necessary and then package the installer in a
+signed update file.
+
+Docker Support
+--------------
+
+**MOVED, DEPRECATION NOTICE:** Most of this functionality has been moved
+to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
+easier to build and use, and easier to incorporate into other
+projects.
+
+ - https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh

 Unix Support
 ------------

-It is possible to use these profiles on Linux and possibly other
-Unixes, if Firefox is already installed on the system. It can be
-installed system-wide using the `make install` target. Running
-`make install` requires root, and requires `make` to have been run
-first. To install on Unix, system-wide, run:
+**MOVED. DEPRECATION NOTICE:** Most of this functionality has been moved
+to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
+easier to build and use, and easier to incorporate into other
+projects. It is the better option for nearly every non-Windows case
+right now. You can get binary packages from:

-        make
-        sudo make install
+ - https://github.com/eyedeekay/i2p.plugins.firefox/releases

-To run without installing them system wide, unpack the `profile*.tgz`
-to a location of your choice and run the `i2pbrowser.sh` script. This
-will start a Firefox profile configured to use I2P.
+or look at

-        tar xvf profile-0.3.tgz
-        cd profile
-        ./i2pbrowser.sh
+ - https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md

-If you want to run the app-like i2pconfig browser, then follow the
-same steps with app-profile*.tgz.
+for instructions on how to build your own packages. These packages are
+unofficial! Although I do dogfood most of them and the `.jar` gets thorough
+testing.

-        tar xvf app-profile-0.3.tgz
-        cd app-profile
-        ./i2pconfig.sh
-
-To generate a `deb` package, install the package `checkinstall` and run
-the `make checkinstall` target after building with `make`.
-
-        make
-        make checkinstall
-        sudo apt install ./i2p-firefox*.deb
-
-If you want to set up i2pconfig to run when you start the service
-with `sudo service i2p start` then you can run the script:
-
-        /usr/local/bin/i2p-config-service-setup
+**The only remotely interesting Unix functionality that remains in this**
+**repository is the construction of a portable. You can use `targz.sh` to**
+**generate that. Once generated, `cd I2P && ./lib/torbrowser.sh` to complete**
+**setup, and `./bin/I2P` to run it.**

 Issues
 ------
@ -99,14 +247,29 @@ pertaining to the plugins may be reported to their upstream
 maintainers if it's determined that our configuration is not at
 fault.

-NoScript is developed on Github by `hackademix` and the community:
- - https://github.com/hackademix/noscript
+## Credits

-HTTPS Everywhere is developed on Github by the EFF:
- - https://github.com/EFForg/https-everywhere
+This profile manager makes use of a set of browser extensions which are largely the work of others.
+It makes use of dependencies that are the work of others. In many ways, it's merely an elaborate
+configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
+projects, developers, and communities:
+
+### Firefox and Chrome Extensions
+
+- [NoScript - Giorgio Maone and others](https://noscript.net)
+- [HTTPS Everywhere - Electronic Frontier Foundation](https://www.eff.org/https-everywhere)
+- [uBlock Origin - Raymond Gorhill and others](https://ublockorigin.com/)
+- [LocalCDN - nobody and others](https://www.localcdn.org/)
+- [jShelter - Libor Polčák and others](https://jshelter.org/)
+
+### Firefox Configuration Modifiations
+
+- [Arkenfox - Thorin Oakenpants and Others](https://github.com/arkenfox/user.js/)
+
+You can find the license files for each of the these projects in the `src/i2p.firefox.*.profile/extensions/*`
+directory for Firefox, and the `src/i2p.chromium.*.profile/extensions/*.js/*` directories for Chromium within
+the [`i2p.plugins.firefox`](https://i2pgit.org/idk/i2p.plugins.firefox) project.

 I2P in Private Browsing is developed on Gitlab and Github by idk and the community:
 - https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox
 - https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox
-
-
--- a/UPDATES.html
+++ b/UPDATES.html
@ -0,0 +1,166 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+  </head>
+  <body>
+    <div id="navbar">
+      <a href="#shownav">
+        Show navigation
+      </a>
+      <div id="shownav">
+        <div id="hidenav">
+          <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
+            <li>
+              <a href="index.html">
+                index
+              </a>
+            </li>
+            <li>
+              <a href="LICENSE.html">
+                LICENSE
+              </a>
+            </li>
+            <li>
+              <a href="UPDATES.html">
+                UPDATES
+              </a>
+            </li>
+          </ul>
+          <br>
+          <a href="#hidenav">
+            Hide Navigation
+          </a>
+        </div>
+      </div>
+    </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
+    <h1>
+      Setting up an Update Server for an I2P Bundle
+    </h1>
+    <p>
+      It is important to set up a signed update server so that people are able to
+      safely and anonymously update your I2P bundle.
+    </p>
+    <h2>
+      The quick way:
+    </h2>
+    <p>
+      This process depends on my ability to push releases to github. If you are
+      forking, setting up a dev server, or taking over because I got hit by a bus,
+      you&rsquo;ll need to do it the complete way.
+    </p>
+    <p>
+      For as long as I am building updates, you will be able to mirror the jpackaged
+      Windows bundle by cloning the repository
+      <code>
+        https://github.com/eyedeekay/i2p
+      </code>
+      and
+      running the
+      <code>
+        make docker run
+      </code>
+      target in that repository. You can retrieve the
+      base32 address of your update server by viewing the log with
+      <code>
+        docker logs eephttpd-jpackage | grep b32.i2p | tee eephttpd-address.md
+      </code>
+      . To
+      update the site, run
+      <code>
+        ./update.site.sh
+      </code>
+      in that repository.
+    </p>
+    <p>
+      Once you have cloned the repository and started the container with
+      <code>
+        make docker run
+      </code>
+      , you can simply add
+      <code>
+        path/to/repo/update-site.sh
+      </code>
+      to your
+      <code>
+        crontab
+      </code>
+      and it will update at an interval of your choosing.
+    </p>
+    <h2>
+      The complete way:
+    </h2>
+    <p>
+      TODO: describe how to do it with less of the awesome fancy stuff I put together
+      to make it easier on myself to keep an update server going.
+    </p>
+    <div id="sourcecode">
+      <span id="sourcehead">
+        <strong>
+          Get the source code:
+        </strong>
+      </span>
+      <ul>
+        <li>
+          <a href="https://github.com/eyedeekay/i2p.firefox">
+            Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <a href="#show">
+        Show license
+      </a>
+      <div id="show">
+        <div id="hide">
+          <pre><code>Copyright 2018
+
+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.
+</code></pre>
+          <a href="#hide">
+            Hide license
+          </a>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>
--- a/UPDATES.md
+++ b/UPDATES.md
@ -0,0 +1,29 @@
+Setting up an Update Server for an I2P Bundle
+=============================================
+
+It is important to set up a signed update server so that people are able to
+safely and anonymously update your I2P bundle.
+
+The quick way:
+--------------
+
+This process depends on my ability to push releases to github. If you are
+forking, setting up a dev server, or taking over because I got hit by a bus,
+you'll need to do it the complete way.
+
+For as long as I am building updates, you will be able to mirror the jpackaged
+Windows bundle by cloning the repository `https://github.com/eyedeekay/i2p` and
+running the `make docker run` target in that repository. You can retrieve the
+base32 address of your update server by viewing the log with 
+`docker logs eephttpd-jpackage | grep b32.i2p | tee eephttpd-address.md`. To
+update the site, run `./update.site.sh` in that repository.
+
+Once you have cloned the repository and started the container with
+`make docker run`, you can simply add `path/to/repo/update-site.sh` to your
+`crontab` and it will update at an interval of your choosing.
+
+The complete way:
+-----------------
+
+TODO: describe how to do it with less of the awesome fancy stuff I put together
+to make it easier on myself to keep an update server going.
--- a/amo-version.sh
+++ b/amo-version.sh
@ -1,3 +1,4 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
+
+curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .file | .url' | tr -d '"'

-curl -s https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1 | jq '.results | .[0] | .version' | tr -d '"'
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,48 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$SCRIPT_DIR/launcher.sh"
+
+if [ -z $I2P_VERSION ]; then 
+    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
+fi
+echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
+
+rm -rf I2P
+
+make src/I2P/config
+
+"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+  --verbose \
+  --java-options "-Xmx512m" \
+  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
+  $JPACKAGE_OPTS \
+  --resource-dir build \
+  --app-content src/I2P/config \
+  --app-content src/unix/torbrowser.sh \
+  --app-content src/icons/windowsUIToopie2.png \
+  --app-content src/icons/ui2pbrowser_icon.ico \
+  --icon src/icons/windowsUIToopie2.png \
+  --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
+
+cp "$I2P_PKG/licenses/"* license/
+cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,106 @@
+2022-09-20 idk
+ * improve compatibility with local service installs and with un-bundled installs side-by-side with bundled intalls
+ * version 1.9.7
+
+2022-09-18 idk
+ * remove unstable/deprecated targets from Makefile.
+ * make it fatal if a jpackaged I2P is not found, the profile launcher is now part of the jpackage
+
+2022-09-16 idk
+ * remove unstable/deprecated functionality. Better solutions have been developed and instructions
+ on how to use them are provided.
+ * update build documentation.
+
+2022-09-13 idk
+ * make it a "portable" application in that the entire app and config can be carried on a portable
+ storage device. Requires minor tweaks to work well still.
+
+2022-09-08 idk
+ * Generate a source tarball when we checkout a branch of i2p.i2p
+ * Upload a source tarball when we do a daily build
+ * Clean up a source tarball when running the clean script. Regenerate tarball after cleaning.
+
+2022-09-06 idk
+ * Point release 1.9.5, fixes a bug which occurs more often on Windows 11, fixes a SusiDNS issue
+
+2022-08-28 idk
+ * Migrate away from batch scripts and simply launch a browser if I2P is already running.
+  This is more flexible, stable, and simplet to install
+ * Improves compatibility with detatched and un-bundled routers on the same system
+ * Fixes bugs in Firefox path finding
+
+2022-05-8 idk
+ * Add translations for Arabic, German, French, Italian, Japanese, Portuguese, Russian,
+ and Chinese.
+ * Add support for I2P+ Router Console detection. Not an endorsement of I2P+, just
+ a convenience requested by a helpful user.
+ * The build system has been radically improved in order to be simpler to set up and
+ configure.
+ * Fixed a bug where the build deleted a config file.
+
+2022-05-5 idk
+ * Fix a bug where the I2P router detection inappropriately prioritized an easy
+  install bundle when a non-bundled instal was in use.
+
+2022-03-25 idk
+ * This release adds support for user-mode, non-privileged installation of the
+  jpackaged router and the browser profile. Admin installation is still supported
+  and detected automatically, to support existing bundles.
+ * On restart to update, will detect if a router requires admin rights to install
+  and will ask the user to authorize the update. In user-mode, no prompt will ever
+  be seen.
+ * Updates to the Firefox profiles to improve compatibility with more Firefoxes
+
+2022-02-10 idk
+* This release fixes automatic update using Bittorrent within the I2P network
+ and the custom Update PostProcessor.
+* Fixes the first-run launcher bug
+* Drastically simplifies the Windows build process
+* Adds support for development releases
+* Adds support for Debian packaging(Of just the Firefox profile)
+
+2021-11-1 idk
+* HTTPS Everywhere will now self-disable on some Firefox versions. This is not
+ an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in
+ HTTPS enforcement features.
+* .bat Script: Detect location of C:\Program Files\I2P or
+ C\Program Files(x86)\I2P in launcher scripts
+* NSIS changes
+ - Make launcher scripts static artifacts instead of generating them during
+  the install process
+ - If a jpackaged I2P router is present in $checkout/I2P, include it in an
+  installer.
+ - If a running installer doesn't find an I2P router in Program Files, install
+  the jpackaged I2P router. Mark it as jpackaged so we can quickly determine
+  from other applications.
+* I2P in Private Browsing changes
+ - bugfix for `reset()` of dynamic theme
+ - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers
+ - improve support for in-I2P HTTPS
+ - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie)
+ - improve support for I2PSnark web handler in HTTPS tabs
+ - icon update(@sadie)
+ - contain android-incompatible features so they won't be executed on Fennec
+ - translate into Spanish
+ - visually conceal/reveal features based on whether they are enabled/configured.
+* I2P Jpackage
+ - support for building an I2P Jpackage has been added to the build system
+  Note that support is platform-specific, to build a Windows jpackage one must
+  use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only
+  Windows jpackages are used for a release product.
+ - For information about how releases are built see README.md and UPDATES.md
+ - The jpackaged router has the following differences from mainline I2P:
+  - The jars are installed to a different directory.
+  - The native libraries are installed to a different directory
+  - The wrapper script is not installed and not used, and replaced by the
+   browser launcher.
+  - The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not
+   compatible but configuration files are.
+  - wrapper.config is unused
+  - The built-by entry will reflect that idk built the package
+  - Use flags to achieve compatibility with plugins that use Reflection on Java
+   17 jpackages
+
 2021-01-17 idk
 * Use Local Application Data instead of Roaming application data for router.config file
 * Use Roaming Application Daya only if a clients.config.d is present, indicating that the
--- a/clean.sh
+++ b/clean.sh
@ -0,0 +1,34 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+cd ../i2p.i2p.jpackage-build/
+ant distclean
+git clean -fd
+git checkout .
+tar --exclude="$SCRIPT_DIR/../i2p.i2p.jpackage-build/.git" -cvzf "$SCRIPT_DIR/../i2p.i2p.jpackage-build.tar.gz" "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+cd "$SCRIPT_DIR" || exit 1
+rm -rf \
+	build \
+	eventlog.txt \
+	hostsdb.blockfile \
+	I2P \
+	i2p_1.0-1_amd64.deb \
+	libjbigi.so \
+	libjcpuid.so \
+	logs \
+	peerProfiles \
+	prngseed.rnd \
+	wrapper.log \
+	*.jar \
+	*.exe \
+	*.dmg
+make clean
--- a/config.mk
+++ b/config.mk
@ -0,0 +1,2 @@
+SIGNER=hankhill19580@gmail.com
+export SIGNER=hankhill19580@gmail.com
--- a/config.sh
+++ b/config.sh
@ -0,0 +1,82 @@
+#! /usr/bin/env bash
+
+## If you need to use a different JVM, JDK, or other utility from
+# build.sh, set it in this file, for example:
+
+uname=$(uname)
+
+#export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
+# to use it for Oracle OpenJDK18
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
+    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
+    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
+    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
+    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+fi
+
+
+### TESTING: 
+## This isn't a default install location, obviously, it's where I unzipped it.
+## It won't work for you unless you kurtly tell Windows that your name is `user`
+## every time you make an account, like I do.
+#PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+#export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+
+## Other potential values(NOT exhaustive):
+
+#export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
+#export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/OpenJDK/jdk-17.0.3"
+
+#BREAKS!
+#export PATH=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2/bin
+#export JAVA_HOME=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2
+#BREAKS!
+# might be fun to learn why this is broken
+
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+#export PATH="$PATH:/c/Program Files/Amazon Corretto/jdk17.0.3_6/bin/"
+#export JAVA_HOME="/c/Program Files/Amazon Corretto/jdk17.0.3_6"
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+
+# These are all things I built the package with today(April 20, 2022, idk)
+
+# Which will determine, of course, which java compilers you use and where
+# your JAVA_HOME(and thus your bootclasspath jars and stuff) come from.
+# So for you reddit nerds who are all into graalVM or whatever, this might
+# be where you go to mess with that.
+
+## Until 1.7.4, releases were built using Eclipse Adoptium OpenJDK
+# but it lags behind a day or two in security updates which did become
+# a major issue in April 2022. At this point it was migrated to Oracle's
+# JDK distribution which was more up to date. Should you prefer, or simply
+# wish to experiment with a different JVM, copy this file to `config_overrides.sh`
+# and add your JAVA_HOME and $PATH changes.
+
+# You can also use this to temporarily add applications into the PATH that are
+# required to build this if you do not wish to edit your PATH across the entire
+# Windows session, and for setting ANT_HOME
+#export ANT_HOME="/c/apache-ant-1.10.9"
+#export PATH="$PATH:$ANT_HOME/bin/"
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi
--- a/config_override.example.sh
+++ b/config_override.example.sh
@ -0,0 +1,82 @@
+#! /usr/bin/env bash
+
+## If you need to use a different JVM, JDK, or other utility from
+# build.sh, set it in this file, for example:
+
+uname=$(uname)
+
+#export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
+# to use it for Oracle OpenJDK18
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+    export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+    export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+fi
+
+
+### TESTING: 
+## This isn't a default install location, obviously, it's where I unzipped it.
+## It won't work for you unless you kurtly tell Windows that your name is `user`
+## every time you make an account, like I do.
+#PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+#export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+
+## Other potential values(NOT exhaustive):
+
+#export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
+#export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/OpenJDK/jdk-17.0.3"
+
+#BREAKS!
+#export PATH=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2/bin
+#export JAVA_HOME=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2
+#BREAKS!
+# might be fun to learn why this is broken
+
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+#export PATH="$PATH:/c/Program Files/Amazon Corretto/jdk17.0.3_6/bin/"
+#export JAVA_HOME="/c/Program Files/Amazon Corretto/jdk17.0.3_6"
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+
+# These are all things I built the package with today(April 20, 2022, idk)
+
+# Which will determine, of course, which java compilers you use and where
+# your JAVA_HOME(and thus your bootclasspath jars and stuff) come from.
+# So for you reddit nerds who are all into graalVM or whatever, this might
+# be where you go to mess with that.
+
+## Until 1.7.4, releases were built using Eclipse Adoptium OpenJDK
+# but it lags behind a day or two in security updates which did become
+# a major issue in April 2022. At this point it was migrated to Oracle's
+# JDK distribution which was more up to date. Should you prefer, or simply
+# wish to experiment with a different JVM, copy this file to `config_overrides.sh`
+# and add your JAVA_HOME and $PATH changes.
+
+# You can also use this to temporarily add applications into the PATH that are
+# required to build this if you do not wish to edit your PATH across the entire
+# Windows session, and for setting ANT_HOME
+#export ANT_HOME="/c/apache-ant-1.10.9"
+#export PATH="$PATH:$ANT_HOME/bin/"
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi
--- a/daily-linux.sh
+++ b/daily-linux.sh
@ -0,0 +1,52 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+### How to set up this script:
+#
+# This script will not work unless you give it a Github API key.
+# You need to create a file in your $HOME directory, which on
+# Windows will by /c/Users/yourusername, called github-release-config.sh,
+# containing this key as the variable GITHUB_TOKEN.
+# github-release-config.sh must also contain:
+# GITHUB_USERNAME=your github username
+git clean -fd
+git checkout .
+./targz.sh
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+sleep 2s
+ZIPCHECKSUM=$(sha256sum "I2P.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.tar.gz" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.tar.gz" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.tar.gz"
--- a/daily-unstable.sh
+++ b/daily-unstable.sh
@ -0,0 +1,60 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config_override.sh"
+
+
+### How to set up this script:
+#
+# This script will not work unless you give it a Github API key.
+# You need to create a file in your $HOME directory, which on
+# Windows will by /c/Users/yourusername, called github-release-config.sh,
+# containing this key as the variable GITHUB_TOKEN.
+# github-release-config.sh must also contain:
+# GITHUB_USERNAME=your github username
+git clean -fd
+git checkout .
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+./unsigned.sh
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+sleep 2s;
+EXECHECKSUM=$(sha256sum "I2P-Easy-Install-Bundle-$I2P_VERSION.exe")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "Java 19 Development Build - $EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "Java 19 Development Build - $EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+powershell Compress-Archive -force I2P I2P.zip
+ZIPCHECKSUM=$(sha256sum "I2P.zip")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "Java 19 Development Build - $ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "Java 19 Development Build - $ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+
+TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Java 19 Development Build - Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Java 19 Development Build - Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
--- a/daily.sh
+++ b/daily.sh
@ -0,0 +1,57 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
+. "$SCRIPT_DIR/config.sh"
+
+### How to set up this script:
+#
+# This script will not work unless you give it a Github API key.
+# You need to create a file in your $HOME directory, which on
+# Windows will by /c/Users/yourusername, called github-release-config.sh,
+# containing this key as the variable GITHUB_TOKEN.
+# github-release-config.sh must also contain:
+# GITHUB_USERNAME=your github username
+git clean -fd
+git checkout .
+./unsigned.sh
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+sleep 2s;
+EXECHECKSUM=$(sha256sum "I2P-Easy-Install-Bundle-$I2P_VERSION.exe")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+powershell Compress-Archive -force I2P I2P.zip
+ZIPCHECKSUM=$(sha256sum "I2P.zip")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+
+TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
--- a/edit-release-unstable.sh
+++ b/edit-release-unstable.sh
@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
--- a/edit-release.sh
+++ b/edit-release.sh
@ -0,0 +1,36 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
--- a/exe.sh
+++ b/exe.sh
@ -0,0 +1,34 @@
+#! /usr/bin/env sh
+
+## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
+
+# Motivation
+
+. ./config.sh
+. ./i2pversion
+./build.sh
+jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
+    --verbose \
+    --java-options "-Xmx512m" \
+    --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
+    $JPACKAGE_OPTS \
+    --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
+    --input build \
+    --verbose \
+    --type exe \
+    --win-dir-chooser \
+    --win-help-url "https://geti2p.net" \
+    --win-menu \
+    --win-menu-group "I2P Easy-Install Bundle" \
+    --win-shortcut \
+    --win-shortcut-prompt \
+    --win-per-user-install \
+    --license-file LICENSE.md \
+    --main-jar launcher.jar \
+    --main-class net.i2p.router.WinLauncher
--- a/experimental.sh
+++ b/experimental.sh
@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+./clean.sh
+wsl make distclean
+./build.sh
+wsl make
--- a/i2plogo.png
+++ b/i2plogo.png
--- a/i2psetproxy.url
+++ b/i2psetproxy.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3674169/0.106/i2ppb@eyedeekay.github.io.xpi
--- a/i2ptunnel.config
+++ b/i2ptunnel.config
@ -0,0 +1,192 @@
+# NOTE: This I2P config file must use UTF-8 encoding
+#
+# If you have a 'split' directory installation, with configuration
+# files in ~/.i2p (Linux), %LOCALAPPDATA%\I2P (Windows),
+# or /Users/(user)/Library/Application Support/i2p (Mac), be sure to
+# edit the file in the configuration directory, NOT the install directory.
+# When running as a Linux daemon, the configuration directory is /var/lib/i2p
+# and the install directory is /usr/share/i2p .
+# When running as a Windows service, the configuration directory is \ProgramData\i2p
+# and the install directory is \Program Files\i2p .
+#
+# On first run, this file will be split into individual config files
+# in i2ptunnel.config.d/ in the configuration directory.
+# Look in that directory for the file to edit.
+#
+
+# eepproxy
+tunnel.0.name=I2P HTTP Proxy
+tunnel.0.description=HTTP proxy for browsing eepsites and the web
+tunnel.0.type=httpclient
+tunnel.0.sharedClient=false
+tunnel.0.interface=127.0.0.1
+tunnel.0.listenPort=4444
+tunnel.0.proxyList=false.i2p
+tunnel.0.i2cpHost=127.0.0.1
+tunnel.0.i2cpPort=7654
+tunnel.0.option.inbound.nickname=HTTP Proxy
+tunnel.0.option.outbound.nickname=HTTP Proxy
+tunnel.0.option.i2cp.leaseSetEncType=4,0
+tunnel.0.option.i2cp.reduceIdleTime=900000
+tunnel.0.option.i2cp.reduceOnIdle=true
+tunnel.0.option.i2cp.reduceQuantity=1
+tunnel.0.option.i2p.streaming.connectDelay=1000
+tunnel.0.option.i2ptunnel.httpclient.SSLOutproxies=false.i2p
+tunnel.0.option.inbound.length=3
+tunnel.0.option.inbound.lengthVariance=0
+tunnel.0.option.outbound.length=3
+tunnel.0.option.outbound.lengthVariance=0
+tunnel.0.option.outbound.priority=10
+tunnel.0.startOnLoad=true
+tunnel.0.option.persistentClientKey=false
+tunnel.0.option.i2cp.closeIdleTime=1800000
+tunnel.0.option.i2cp.closeOnIdle=true
+tunnel.0.option.i2cp.newDestOnResume=true
+
+# irc
+tunnel.1.name=Irc2P
+tunnel.1.description=IRC tunnel to access the Irc2P network
+tunnel.1.type=ircclient
+tunnel.1.sharedClient=false
+tunnel.1.interface=127.0.0.1
+tunnel.1.listenPort=6668
+tunnel.1.targetDestination=irc.postman.i2p:6667,irc.echelon.i2p:6667
+tunnel.1.i2cpHost=127.0.0.1
+tunnel.1.i2cpPort=7654
+tunnel.1.option.inbound.nickname=Irc2P
+tunnel.1.option.outbound.nickname=Irc2P
+tunnel.1.option.i2cp.closeIdleTime=1200000
+tunnel.1.option.i2cp.closeOnIdle=true
+tunnel.1.option.i2cp.delayOpen=true
+tunnel.1.option.i2cp.destination.sigType=7
+tunnel.1.option.i2cp.leaseSetEncType=4,0
+tunnel.1.option.i2cp.newDestOnResume=false
+tunnel.1.option.i2cp.reduceIdleTime=600000
+tunnel.1.option.i2cp.reduceOnIdle=true
+tunnel.1.option.i2cp.reduceQuantity=1
+tunnel.1.option.i2p.streaming.connectDelay=1000
+tunnel.1.option.i2p.streaming.maxWindowSize=16
+tunnel.1.option.inbound.length=3
+tunnel.1.option.inbound.lengthVariance=0
+tunnel.1.option.outbound.length=3
+tunnel.1.option.outbound.lengthVariance=0
+tunnel.1.option.outbound.priority=15
+tunnel.1.startOnLoad=true
+
+# local eepserver
+tunnel.3.name=I2P webserver
+tunnel.3.description=My eepsite
+tunnel.3.type=httpserver
+tunnel.3.targetHost=127.0.0.1
+tunnel.3.targetPort=7658
+tunnel.3.spoofedHost=mysite.i2p
+tunnel.3.privKeyFile=eepsite/eepPriv.dat
+tunnel.3.i2cpHost=127.0.0.1
+tunnel.3.i2cpPort=7654
+tunnel.3.option.inbound.nickname=eepsite
+tunnel.3.option.outbound.nickname=eepsite
+tunnel.3.option.i2cp.destination.sigType=7
+tunnel.3.option.i2cp.leaseSetEncType=4,0
+tunnel.3.option.inbound.length=3
+tunnel.3.option.inbound.lengthVariance=0
+tunnel.3.option.outbound.length=3
+tunnel.3.option.outbound.lengthVariance=0
+# uncomment for HTTPS to port 7668
+#tunnel.3.option.targetForPort.443=127.0.0.1:7668
+tunnel.3.startOnLoad=false
+
+# postman's SMTP server - see hq.postman.i2p
+tunnel.4.description=smtp server
+tunnel.4.i2cpHost=127.0.0.1
+tunnel.4.i2cpPort=7654
+tunnel.4.interface=127.0.0.1
+tunnel.4.listenPort=7659
+tunnel.4.name=smtp.postman.i2p
+tunnel.4.option.inbound.nickname=shared clients
+tunnel.4.option.outbound.nickname=shared clients
+tunnel.4.option.i2cp.leaseSetEncType=4,0
+tunnel.4.option.i2cp.reduceIdleTime=900000
+tunnel.4.option.i2cp.reduceOnIdle=true
+tunnel.4.option.i2cp.reduceQuantity=1
+tunnel.4.option.inbound.length=3
+tunnel.4.option.inbound.lengthVariance=0
+tunnel.4.option.outbound.length=3
+tunnel.4.option.outbound.lengthVariance=0
+tunnel.4.startOnLoad=true
+tunnel.4.targetDestination=smtp.postman.i2p:25
+tunnel.4.type=client
+tunnel.4.sharedClient=true
+
+# postman's POP3 server - see hq.postman.i2p
+tunnel.2.name=pop3.postman.i2p
+tunnel.2.description=pop3 server
+tunnel.2.i2cpHost=127.0.0.1
+tunnel.2.i2cpPort=7654
+tunnel.2.interface=127.0.0.1
+tunnel.2.listenPort=7660
+tunnel.2.option.inbound.nickname=shared clients
+tunnel.2.option.outbound.nickname=shared clients
+tunnel.2.option.i2cp.leaseSetEncType=4,0
+tunnel.2.option.i2cp.reduceIdleTime=900000
+tunnel.2.option.i2cp.reduceOnIdle=true
+tunnel.2.option.i2cp.reduceQuantity=1
+tunnel.2.option.i2p.streaming.connectDelay=1000
+tunnel.2.option.inbound.length=3
+tunnel.2.option.inbound.lengthVariance=0
+tunnel.2.option.outbound.length=3
+tunnel.2.option.outbound.lengthVariance=0
+tunnel.2.startOnLoad=true
+tunnel.2.targetDestination=pop.postman.i2p:110
+tunnel.2.type=client
+tunnel.2.sharedClient=true
+
+# HTTPS (CONNECT) outproxy
+tunnel.5.name=I2P HTTPS Proxy
+tunnel.5.description=HTTPS proxy for browsing eepsites and the web
+tunnel.5.type=connectclient
+tunnel.5.sharedClient=true
+tunnel.5.interface=127.0.0.1
+tunnel.5.listenPort=4445
+tunnel.5.proxyList=outproxy-tor.meeh.i2p
+tunnel.5.i2cpHost=127.0.0.1
+tunnel.5.i2cpPort=7654
+tunnel.5.option.inbound.nickname=shared clients
+tunnel.5.option.outbound.nickname=shared clients
+tunnel.5.option.i2cp.leaseSetEncType=4,0
+tunnel.5.option.i2cp.reduceIdleTime=900000
+tunnel.5.option.i2cp.reduceOnIdle=true
+tunnel.5.option.i2cp.reduceQuantity=1
+tunnel.5.option.i2p.streaming.connectDelay=1000
+tunnel.5.option.inbound.length=3
+tunnel.5.option.inbound.lengthVariance=0
+tunnel.5.option.outbound.length=3
+tunnel.5.option.outbound.lengthVariance=0
+tunnel.5.startOnLoad=true
+
+# I2P Git Repositories SSH Access
+tunnel.6.description=I2P Git Repositories SSH Access
+tunnel.6.interface=127.0.0.1
+tunnel.6.listenPort=7670
+tunnel.6.name=gitssh.idk.i2p
+tunnel.6.option.i2cp.closeIdleTime=1800000
+tunnel.6.option.i2cp.closeOnIdle=false
+tunnel.6.option.i2cp.delayOpen=true
+tunnel.6.option.i2cp.destination.sigType=7
+tunnel.6.option.i2cp.leaseSetEncType=4
+tunnel.6.option.i2cp.newDestOnResume=false
+tunnel.6.option.i2cp.reduceIdleTime=1200000
+tunnel.6.option.i2cp.reduceOnIdle=true
+tunnel.6.option.i2cp.reduceQuantity=1
+tunnel.6.option.inbound.backupQuantity=1
+tunnel.6.option.inbound.length=3
+tunnel.6.option.inbound.nickname=gitssh.idk.i2p
+tunnel.6.option.inbound.quantity=3
+tunnel.6.option.outbound.backupQuantity=1
+tunnel.6.option.outbound.length=3
+tunnel.6.option.outbound.nickname=gitssh.idk.i2p
+tunnel.6.option.outbound.quantity=3
+tunnel.6.sharedClient=false
+tunnel.6.startOnLoad=false
+tunnel.6.targetDestination=gitssh.idk.i2p
+tunnel.6.type=client
+
--- a/16
+++ b/16
@ -0,0 +1,16 @@
+#! /usr/bin/env sh
+
+JNA_VERSION=5.11.0
+export JNA_VERSION=5.11.0
+I2PFIREFOX_VERSION=1.0.1
+export I2PFIREFOX_VERSION=1.0.1
+# Comment this out to build from an alternate branch or
+# the tip of the master branch.
+VERSIONMAJOR=1
+VERSIONMINOR=9
+VERSIONBUILD=7
+I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+VERSION=i2p-jpackage-1.9.4
+export VERSION=i2p-jpackage-1.9.4
+
--- a/index.html
+++ b/index.html
@ -0,0 +1,783 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+  </head>
+  <body>
+    <div id="navbar">
+      <a href="#shownav">
+        Show navigation
+      </a>
+      <div id="shownav">
+        <div id="hidenav">
+          <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
+            <li>
+              <a href="index.html">
+                index
+              </a>
+            </li>
+            <li>
+              <a href="LICENSE.html">
+                LICENSE
+              </a>
+            </li>
+            <li>
+              <a href="UPDATES.html">
+                UPDATES
+              </a>
+            </li>
+          </ul>
+          <br>
+          <a href="#hidenav">
+            Hide Navigation
+          </a>
+        </div>
+      </div>
+    </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
+    <h1>
+      I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
+    </h1>
+    <h2>
+      Features:
+    </h2>
+    <ul>
+      <li>
+        Automatically select an up-to-date, secure browser from the host platform, with Tor Browser and Firefox preferred.
+      </li>
+      <li>
+        Automatically configure a profile for I2P
+      </li>
+      <li>
+        Automatically block-list all non-I2P local destinations
+      </li>
+      <li>
+        Enable first-party isolation, anti-fingerprinting, letterboxing, fusion, other privacy and security options
+      </li>
+      <li>
+        Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
+      </li>
+    </ul>
+    <h2>
+      Build Dependencies:
+    </h2>
+    <p>
+      To build this, you will need the following software packages
+      (all available in Debian and Ubuntu, see WSL section below):
+    </p>
+    <ul>
+      <li>
+        make
+      </li>
+      <li>
+        nsis
+      </li>
+      <li>
+        dos2unix
+      </li>
+      <li>
+        curl
+      </li>
+      <li>
+        jq
+      </li>
+    </ul>
+    <p>
+      These need to be installed in the environment where the NSIS
+      Package is build, NOT the environment where the java package
+      is built. These may be different, because you will need to
+      use a system which provides a Unix-like environment on top of
+      a Windows system. You can use WSL or Cygwin, and more detailed
+      instructions are provided below.
+    </p>
+    <p>
+      Building for Windows target from Linux is not possible unless
+      you obtain a Windows package from my github.
+    </p>
+    <p>
+      In addition, you will need the NSIS plugin &ldquo;ShellExecAsUser&rdquo; which you can get from the
+      <a href="https://nsis.sourceforge.io/ShellExecAsUser_plug-in">
+        NSIS Wiki Page
+      </a>
+      . In order to install
+      the plugin on Debian, Ubuntu, or using
+      <code>
+        WSL
+      </code>
+      , you can download the:
+      <a href="https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z">
+        7zip release
+      </a>
+      and copy the content of
+      <code>
+        Plugins
+      </code>
+      to
+      <code>
+        /usr/share/nsis/Plugins
+      </code>
+      .
+    </p>
+    <pre><code class="language-sh">cp -rv Plugins/* /usr/share/nsis/Plugins/
+</code></pre>
+    <h2>
+      Including a jpackaged I2P Router
+    </h2>
+    <p>
+      <strong>
+        Prerequisites:
+      </strong>
+      You need to have OpenJDK 14 or greater installed and configured
+      with your
+      <code>
+        %JAVA_HOME%
+      </code>
+      environment variable configured and
+      <code>
+        %JAVA_HOME%/bin
+      </code>
+      on
+      your
+      <code>
+        %PATH%
+      </code>
+      . You need to have Apache Ant installed and configured with
+      <code>
+        %ANT_HOME%
+      </code>
+      environment variable configured and
+      <code>
+        %ANT_HOME%/bin
+      </code>
+      on your
+      <code>
+        %PATH%
+      </code>
+      . You must have
+      Cygwin installed. You must have
+      <code>
+        NSIS.exe
+      </code>
+      installed and
+      <code>
+        makensis
+      </code>
+      available on your
+      <code>
+        %PATH%
+      </code>
+      . You must have Git for Windows installed. When installing git for Windows,
+      you should select &ldquo;Checkout as is, commit as is&rdquo; and leave line-endings alone.
+    </p>
+    <p>
+      The Windows build tools listed above must be installed on the Windows host machine.
+    </p>
+    <p>
+      TODO: Add links to the respective instructions for each of these.
+    </p>
+    <p>
+      <strong>
+        Note that after the dependencies are installed, this step is automated
+      </strong>
+      <strong>
+        with
+        <code>
+          ./build.sh
+        </code>
+        .
+      </strong>
+    </p>
+    <p>
+      In order to include a jpackaged(dependency-free) I2P router in the Profile
+      Bundle you will need to build the jpackaged I2P router as an &ldquo;App Image&rdquo; on
+      a Windows system and place it into a directory called
+      <code>
+        I2P
+      </code>
+      in your
+      <code>
+        i2p.firefox
+      </code>
+      checkout. Building without a jpackage is no longer supported.
+    </p>
+    <p>
+      Assuming a working java and jpackage environment on your Windows system, the
+      following command should generate a suitable &ldquo;App Image&rdquo; in a directory
+      called &ldquo;I2P.&rdquo;
+    </p>
+    <pre><code>    export I2P_VERSION=0.9.49
+    cp -R ../i2p.i2p/pkg-temp/lib build/lib
+    jpackage --type app-image --name I2P --app-version &quot;$I2P_VERSION&quot; \
+      --verbose \
+      --resource-dir build/lib \
+      --input build/lib --main-jar router.jar --main-class net.i2p.router.RouterLaunch
+</code></pre>
+    <p>
+      Transfer the I2P directory to the machine where you build i2p.firefox if
+      necessary, then complete the regular build instructions. If a jpackaged I2P router
+      isn&rsquo;t present to use at build time, the inclusion will be skipped automatically
+      with a non-fatal warning.
+    </p>
+    <p>
+      Pre-built app-images are available from my daily releases at:
+    </p>
+    <pre><code>    https://github.com/eyedeekay/i2p.plugins.firefox/releases/
+</code></pre>
+    <h2>
+      Windows Build
+    </h2>
+    <p>
+      After installing the dependencies and completing the preparations,
+      just run
+      <code>
+        make
+      </code>
+      .  This will produce the install.exe - the windows
+      installer, which sets up the shortcuts to launch Firefox on Windows.
+      Building without a jpackage is no longer supported.
+    </p>
+    <p>
+      When generating a build it&rsquo;s important to make sure that the
+      licenses for all the bundled softare are included. This should happen
+      automatically. When bundling software, describe the terms and where
+      they are applied in the
+      <code>
+        LICENSE.index
+      </code>
+      , then add the full license
+      to the
+      <code>
+        licenses
+      </code>
+      directory. Then, add the full license to the
+      <code>
+        cat
+      </code>
+      command in the
+      <code>
+        build/licenses
+      </code>
+      make target. The build/licenses
+      target is run automatically during the build process.
+    </p>
+    <h2>
+      End-to-End Windows build process using WSL(
+      <strong>
+        Recommended
+      </strong>
+      )
+    </h2>
+    <p>
+      <strong>
+        See
+        <code>
+          config.sh
+        </code>
+        and
+        <code>
+          i2pversion
+        </code>
+        for instructions on how to tweak
+      </strong>
+      <strong>
+        the build process. File an issue if you need help.
+      </strong>
+    </p>
+    <p>
+      <strong>
+        If you&rsquo;ve already done this once, you can just use:
+      </strong>
+      <code>
+        ./unsigned.sh
+      </code>
+      <strong>
+        in
+        <code>
+          git bash
+        </code>
+      </strong>
+      to automatically build an installer. If you
+      are using this method, you may use the
+      <code>
+        makensis
+      </code>
+      and
+      <code>
+        make
+      </code>
+      from
+      Ubuntu in WSL.
+    </p>
+    <ol>
+      <li>
+        <p>
+          <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps">
+            Set up Windows Subsystem for Linux per Microsoft&rsquo;s instructions
+          </a>
+        </p>
+      </li>
+      <li>
+        <p>
+          <a href="https://www.microsoft.com/store/apps/9n6svws3rx71">
+            Install Ubuntu Focal per Microsoft&rsquo;s instructions
+          </a>
+        </p>
+      </li>
+      <li>
+        <p>
+          Open Git Bash.
+        </p>
+      </li>
+      <li>
+        <p>
+          Install prerequisites
+          <code>
+            wsl sudo apt-get update &amp;&amp; sudo apt-get install make nsis nsis-pluginapi dos2unix curl jq
+          </code>
+        </p>
+      </li>
+      <li>
+        <p>
+          Clone
+          <code>
+            i2p.i2p
+          </code>
+          and
+          <code>
+            i2p.firefox
+          </code>
+        </p>
+        <pre><code>git clone https://github.com/i2p/i2p.i2p
+git clone https://github.com/i2p/i2p.firefox
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+          inside i2p.i2p. Return to home.
+        </p>
+        <pre><code>cd i2p.i2p
+ant clean pkg
+cd ..
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Move into the i2p.firefox directory. Run the
+          <code>
+            ./build.sh
+          </code>
+          script.
+        </p>
+        <pre><code>cd i2p.firefox
+./build.sh
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Compile the NSIS installer using WSL.
+        </p>
+        <pre><code>wsl make
+</code></pre>
+      </li>
+    </ol>
+    <h2>
+      End-to-End Windows build process using Cygwin(More difficult than WSL for now)
+    </h2>
+    <p>
+      I highly recommend you look into the Chocolatey package manager, which makes it much
+      easier to configure these tools and keep them up to date.
+    </p>
+    <p>
+      <strong>
+        Prerequisites:
+      </strong>
+      In addition to the other prerequisites, you will need to to have
+      <code>
+        make
+      </code>
+      installed with
+      <code>
+        cygwin
+      </code>
+      . If you are using this method, you cannot use the
+      automated build scripts without a hack. You will need to create a file called
+      <code>
+        wsl
+      </code>
+      in a place that is in the path used by
+      <code>
+        git-bash.exe
+      </code>
+      sessions, with the content:
+    </p>
+    <pre><code>#! /usr/bin/env bash
+$@
+</code></pre>
+    <p>
+      For our purposes, as long as everything else is set up and you&rsquo;re using git bash,
+      that is enough to make the scripts compatible with
+      <code>
+        cygwin
+      </code>
+      . Cygwin builds without
+      git bash are not likely to work.
+    </p>
+    <ol>
+      <li>
+        <p>
+          Run the Cygwin
+          <code>
+            setup-$arch.exe
+          </code>
+          for your platform to set up new packages. Select the
+          <code>
+            make
+          </code>
+          <code>
+            jq
+          </code>
+          <code>
+            dos2unix
+          </code>
+          and
+          <code>
+            curl
+          </code>
+          packages.
+        </p>
+      </li>
+      <li>
+        <p>
+          Open a cygwin terminal.
+        </p>
+      </li>
+      <li>
+        <p>
+          Clone
+          <code>
+            i2p.i2p
+          </code>
+          and
+          <code>
+            i2p.firefox
+          </code>
+        </p>
+        <pre><code>git clone https://github.com/i2p/i2p.i2p
+git clone https://github.com/i2p/i2p.firefox
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+          inside i2p.i2p. Return to home.
+        </p>
+        <pre><code>cd i2p.i2p
+ant clean pkg
+cd ..
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Move into the i2p.firefox directory. Run the
+          <code>
+            ./build.sh
+          </code>
+          script.
+        </p>
+        <pre><code>cd i2p.firefox
+./build.sh
+</code></pre>
+      </li>
+      <li>
+        <p>
+          Run
+          <code>
+            make
+          </code>
+          to build the installer.
+        </p>
+      </li>
+    </ol>
+    <h2>
+      Doing a Release
+    </h2>
+    <p>
+      Once you have the installer
+      <code>
+        .exe
+      </code>
+      file produced by NSIS, you&rsquo;re almost ready to
+      do a release. As a final step, someone must sign the
+      <code>
+        .exe
+      </code>
+      file using a
+      Certificate which Windows will recognize. The current signer of the Windows
+      bundle is Zlatinb. Standard Windows signing tools are used.
+    </p>
+    <pre><code class="language-sh">./release.sh
+</code></pre>
+    <p>
+      produces the binary.
+    </p>
+    <h2>
+      Building a signed update file
+    </h2>
+    <p>
+      Building a signed update file for automatically updating a Windows I2P router
+      requires you to either be using linux, or have Go installed in your Cygwin or WSL environment.
+      On Linux(Where I sign the su3 files), this works:
+    </p>
+    <pre><code>    make su3
+</code></pre>
+    <p>
+      to run the signing tool if necessary and then package the installer in a
+      signed update file.
+    </p>
+    <h2>
+      Docker Support
+    </h2>
+    <p>
+      <strong>
+        MOVED, DEPRECATION NOTICE:
+      </strong>
+      Most of this functionality has been moved
+      to
+      <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+        http://git.idk.i2p/idk/i2p.plugins.firefox
+      </a>
+      which is more stable,
+      easier to build and use, and easier to incorporate into other
+      projects.
+    </p>
+    <ul>
+      <li>
+        <a href="https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh">
+          https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh
+        </a>
+      </li>
+    </ul>
+    <h2>
+      Unix Support
+    </h2>
+    <p>
+      <strong>
+        MOVED. DEPRECATION NOTICE:
+      </strong>
+      Most of this functionality has been moved
+      to
+      <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+        http://git.idk.i2p/idk/i2p.plugins.firefox
+      </a>
+      which is more stable,
+      easier to build and use, and easier to incorporate into other
+      projects. It is the better option for nearly every non-Windows case
+      right now. You can get binary packages from:
+    </p>
+    <ul>
+      <li>
+        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+          https://github.com/eyedeekay/i2p.plugins.firefox/releases
+        </a>
+      </li>
+    </ul>
+    <p>
+      or look at
+    </p>
+    <ul>
+      <li>
+        <a href="https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md">
+          https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md
+        </a>
+      </li>
+    </ul>
+    <p>
+      for instructions on how to build your own packages. These packages are
+      unofficial! Although I do dogfood most of them and the
+      <code>
+        .jar
+      </code>
+      gets thorough
+      testing.
+    </p>
+    <p>
+      <strong>
+        The only remotely interesting Unix functionality that remains in this
+      </strong>
+      <strong>
+        repository is the construction of a portable. You can use
+        <code>
+          targz.sh
+        </code>
+        to
+      </strong>
+      <strong>
+        generate that.
+      </strong>
+    </p>
+    <h2>
+      Issues
+    </h2>
+    <p>
+      To report issues against this browser profile, please file issues
+      at
+      <a href="https://i2pgit.org/i2p-hackers/i2p.firefox">
+        the official Gitlab
+      </a>
+      or the
+      <a href="https://github.com/i2p/i2p.firefox">
+        Github Mirror
+      </a>
+      . Issues
+      pertaining to the plugins may be reported to their upstream
+      maintainers if it&rsquo;s determined that our configuration is not at
+      fault.
+    </p>
+    <h2>
+      Credits
+    </h2>
+    <p>
+      This profile manager makes use of a set of browser extensions which are largely the work of others.
+      It makes use of dependencies that are the work of others. In many ways, it&rsquo;s merely an elaborate
+      configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
+      projects, developers, and communities:
+    </p>
+    <h3>
+      Firefox and Chrome Extensions
+    </h3>
+    <ul>
+      <li>
+        <a href="https://noscript.net">
+          NoScript - Giorgio Maone and others
+        </a>
+      </li>
+      <li>
+        <a href="https://www.eff.org/https-everywhere">
+          HTTPS Everywhere - Electronic Frontier Foundation
+        </a>
+      </li>
+      <li>
+        <a href="https://ublockorigin.com/">
+          uBlock Origin - Raymond Gorhill and others
+        </a>
+      </li>
+      <li>
+        <a href="https://www.localcdn.org/">
+          LocalCDN - nobody and others
+        </a>
+      </li>
+      <li>
+        <a href="https://jshelter.org/">
+          jShelter - Libor Polčák and others
+        </a>
+      </li>
+    </ul>
+    <h3>
+      Firefox Configuration Modifiations
+    </h3>
+    <ul>
+      <li>
+        <a href="https://github.com/arkenfox/user.js/">
+          Arkenfox - Thorin Oakenpants and Others
+        </a>
+      </li>
+    </ul>
+    <p>
+      You can find the license files for each of the these projects in the
+      <code>
+        src/i2p.firefox.*.profile/extensions/*
+      </code>
+      directory for Firefox, and the
+      <code>
+        src/i2p.chromium.*.profile/extensions/*.js/*
+      </code>
+      directories for Chromium within
+      the
+      <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
+        <code>
+          i2p.plugins.firefox
+        </code>
+      </a>
+      project.
+    </p>
+    <p>
+      I2P in Private Browsing is developed on Gitlab and Github by idk and the community:
+      -
+      <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox">
+        https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox
+      </a>
+      -
+      <a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox">
+        https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox
+      </a>
+    </p>
+    <div id="sourcecode">
+      <span id="sourcehead">
+        <strong>
+          Get the source code:
+        </strong>
+      </span>
+      <ul>
+        <li>
+          <a href="https://github.com/eyedeekay/i2p.firefox">
+            Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <a href="#show">
+        Show license
+      </a>
+      <div id="show">
+        <div id="hide">
+          <pre><code>Copyright 2018
+
+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.
+</code></pre>
+          <a href="#hide">
+            Hide license
+          </a>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>
--- a/java/net/i2p/router/CopyConfigDir.java
+++ b/java/net/i2p/router/CopyConfigDir.java
@ -0,0 +1,304 @@
+package net.i2p.router;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+public class CopyConfigDir extends WindowsServiceUtil {
+  static final Logger logger = Logger.getLogger("configlog");
+
+  public static void initLogger() {
+    try {
+      // This block configure the logger with handler and formatter
+      FileHandler fh = new FileHandler(logFile().toString());
+      logger.addHandler(fh);
+      SimpleFormatter formatter = new SimpleFormatter();
+      fh.setFormatter(formatter);
+      // the following statement is used to log any messages
+      logger.info("My first log");
+    } catch (SecurityException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public static boolean copyDirectory(String baseDir, String workDir) {
+    File baseFile = new File(baseDir);
+    File workFile = new File(workDir);
+    return copyDirectory(baseFile, workFile);
+  }
+
+  public static boolean copyDirectory(File baseDir, File workDir) {
+    for (File file : baseDir.listFiles()) {
+      String fPath = file.getAbsolutePath().replace(
+          file.getParentFile().getAbsolutePath(), "");
+      String newPath = workDir.toString() + fPath;
+      if (file.isDirectory())
+        if (copyDirectory(file, new File(newPath)))
+          return false;
+      if (file.isFile())
+        if (0 == copyFile(file, new File(newPath), true))
+          return false;
+    }
+    return true;
+  }
+
+  public static boolean copyConfigDirectory(File baseDir, File workDir) {
+    for (File file : baseDir.listFiles()) {
+      // System.out.println(file.getAbsolutePath());
+      String fPath = file.getAbsolutePath().replace(
+          file.getParentFile().getAbsolutePath(), "");
+      String newPath = workDir.toString() + fPath;
+      if (file.isDirectory())
+        if (!copyConfigDirectory(file, new File(newPath)))
+          return false;
+      if (file.isFile()) {
+        int cnr = copyFileNeverOverwrite(file, new File(newPath));
+        if (0 == cnr)
+          return false;
+        if (1 == cnr) {
+          logger.info("using jpackaged configs in a jpackaged install, creating jpackaged file");
+          File jpackagedConfigsInUse = new File(appImageHome(), "jpackaged");
+          if (!jpackagedConfigsInUse.exists()){
+            try{
+              jpackagedConfigsInUse.createNewFile();
+            }catch(IOException e){
+              logger.warning("Error creating jpackaged file, delete config files manually when uninstalling");
+            }
+          }
+        }
+        if (-1 == cnr) {
+          logger.info("not overwriting existing config file, not creating jpackaged file");
+        }
+      }
+    }
+    return true;
+  }
+
+  public static int copyFileNeverOverwrite(String basePath, String workPath) {
+    File baseFile = new File(basePath);
+    File workFile = new File(workPath);
+    return copyFileNeverOverwrite(baseFile, workFile);
+  }
+
+  public static int copyFileNeverOverwrite(File basePath, File workPath) {
+    return copyFile(basePath, workPath, false);
+  }
+
+  public static int copyFile(File basePath, File workPath, boolean overWrite) {
+    if (!basePath.exists()) {
+      logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
+      return 0;
+    }
+
+    if (!overWrite && workPath.exists()) {
+      logger.info(workPath.getAbsolutePath() +
+                  " already exists, not overwriting");
+      return -1;
+    }
+
+    File workDir = workPath.getParentFile();
+    if (!workDir.exists()) {
+      workDir.mkdirs();
+    }
+    try (InputStream in =
+             new BufferedInputStream(new FileInputStream(basePath));
+         OutputStream out =
+             new BufferedOutputStream(new FileOutputStream(workPath))) {
+
+      byte[] buffer = new byte[1024];
+      int lengthRead;
+      while ((lengthRead = in.read(buffer)) > 0) {
+        out.write(buffer, 0, lengthRead);
+        out.flush();
+      }
+      in.close();
+      out.close();
+      return 1;
+    } catch (Throwable e) {
+      logger.warning(e.toString());
+      logger.warning("failed to copy " + basePath.getAbsolutePath() + " to " +
+                     workPath.getAbsolutePath());
+      return 0;
+    }
+  }
+
+  protected static File selectHome() { // throws Exception {
+    String path_override = System.getenv("I2P_CONFIG");
+    if (path_override != null) {
+      File path = new File(path_override);
+      if (path != null && path.exists()) {
+        if (path.isDirectory())
+          return path.getAbsoluteFile();
+        else
+          throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
+      }
+    }
+    File i2p = appImageHome();
+    logger.info("Checking for signs of life in I2P_CONFIG directory: " + i2p);
+    return i2p;
+  }
+
+  protected static File selectProgramFile() {
+    String path_override = System.getenv("I2P");
+    if (path_override != null) {
+      File path = new File(path_override);
+      if (path.exists()) {
+        if (path.isDirectory())
+          return path.getAbsoluteFile();
+        else
+          throw new RuntimeException("I2P is not a directory: " + path);
+      }
+    }
+    File i2p = appImageHome();
+    logger.info("Checking for signs of life in I2P directory: " + i2p);
+    return i2p;
+  }
+
+  /**
+   * get the path to the java home, for jpackage this is related to the
+   * executable itself, which is handy to know. It's a directory called runtime,
+   * relative to the root of the app-image on each platform:
+   *
+   * Windows - Root of appimage is 1 directory above directory named runtime
+   *     ./runtime
+   *
+   * Linux - Root of appimage is 2 directories above directory named runtime
+   *     ./lib/runtime
+   *
+   * Mac OSX - Unknown for now
+   *
+   * @return
+   */
+  protected static File javaHome() {
+    File jrehome = new File(System.getProperty("java.home"));
+    if (jrehome != null) {
+      if (jrehome.exists()) {
+        return jrehome;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the root of the app-image root by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information.
+   *
+   * @return the app-image root
+   */
+  protected static File appImageHome() {
+    File jreHome = javaHome();
+    if (jreHome != null) {
+      switch (osName()) {
+      case "windows":
+        return jreHome.getAbsoluteFile().getParentFile();
+      case "mac":
+      case "linux":
+        return jreHome.getAbsoluteFile().getParentFile().getParentFile();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the binary of the app-image root by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then getting the binary path on a per-platform basis. The path
+   * returned will be relative to the root.
+   *
+   * @return the app-image root
+   */
+  protected static String appImageExe() {
+    File aih = appImageHome();
+    if (aih != null) {
+      switch (osName()) {
+      case "windows":
+        return "I2P.exe";
+      case "mac":
+      case "linux":
+        return "./bin/I2P";
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the default config of the app-image by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then appending the config directory to the end onn a
+   * per-platform basis
+   *
+   * @return the app-image root
+   */
+  protected static File appImageConfig() {
+    File aih = appImageHome();
+    if (aih == null) {
+      return null;
+    }
+    String osName = osName();
+    switch (osName) {
+    case "windows":
+      File winConfigDir = new File(aih, "config");
+      if (winConfigDir != null) {
+        if (winConfigDir.exists()) {
+          return winConfigDir;
+        }
+      }
+    case "mac":
+    case "linux":
+      File linConfigDir = new File(aih, "lib/config");
+      if (linConfigDir != null) {
+        if (linConfigDir.exists()) {
+          return linConfigDir;
+        }
+      }
+    }
+    return null;
+  }
+
+  protected static boolean copyConfigDir() {
+    File appImageConfigDir = appImageConfig();
+    File appImageHomeDir = selectHome();
+    return copyConfigDirectory(appImageConfigDir, appImageHomeDir);
+  }
+
+  protected static String routerConfig() {
+    File appImageHomeDir = selectHome();
+    File routerConf = new File(appImageHomeDir, "router.config");
+    if (routerConf != null) {
+      if (routerConf.exists()) {
+        return routerConf.getAbsolutePath();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * set up the path to the log file
+   *
+   * @return
+   */
+  protected static File logFile() { return logFile("launcher.log"); }
+
+  /**
+   * set up the path to the log file
+   *
+   * @return
+   */
+  protected static File logFile(String p) {
+    File log = new File(selectProgramFile(), "logs");
+    if (!log.exists())
+      log.mkdirs();
+    return new File(log, p);
+  }
+}
--- a/java/net/i2p/router/Elevator.java
+++ b/java/net/i2p/router/Elevator.java
@ -0,0 +1,35 @@
+package net.i2p.router;
+
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.Kernel32Util;
+
+public class Elevator {
+  public static void main(String... args) {
+    executeAsAdministrator("c:\\windows\\system32\\notepad.exe", "");
+  }
+
+  public static void executeAsAdministrator(String command, String args) {
+    if (command == "" || command == null) {
+      System.out.println("No command specified");
+      return;
+    }
+    Shell32X.SHELLEXECUTEINFO execInfo = new Shell32X.SHELLEXECUTEINFO();
+    execInfo.lpFile = new WString(command);
+    if (args != null)
+      execInfo.lpParameters = new WString(args);
+    execInfo.nShow = Shell32X.SW_SHOWDEFAULT;
+    execInfo.fMask = Shell32X.SEE_MASK_NOCLOSEPROCESS;
+    execInfo.lpVerb = new WString("runas");
+    boolean result = Shell32X.INSTANCE.ShellExecuteEx(execInfo);
+
+    if (!result) {
+      int lastError = Kernel32.INSTANCE.GetLastError();
+      String errorMessage =
+          Kernel32Util.formatMessageFromLastErrorCode(lastError);
+      throw new RuntimeException("Error performing elevation: " + lastError +
+                                 ": " + errorMessage +
+                                 " (apperror=" + execInfo.hInstApp + ")");
+    }
+  }
+}
--- a/java/net/i2p/router/Shell32X.java
+++ b/java/net/i2p/router/Shell32X.java
@ -0,0 +1,123 @@
+package net.i2p.router;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Shell32;
+import com.sun.jna.platform.win32.WinDef.HINSTANCE;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinReg.HKEY;
+import com.sun.jna.win32.W32APIOptions;
+import java.util.*;
+
+public interface Shell32X extends Shell32 {
+  Shell32X INSTANCE = (Shell32X)Native.loadLibrary(
+      "shell32", Shell32X.class, W32APIOptions.UNICODE_OPTIONS);
+
+  int SW_HIDE = 0;
+  int SW_MAXIMIZE = 3;
+  int SW_MINIMIZE = 6;
+  int SW_RESTORE = 9;
+  int SW_SHOW = 5;
+  int SW_SHOWDEFAULT = 10;
+  int SW_SHOWMAXIMIZED = 3;
+  int SW_SHOWMINIMIZED = 2;
+  int SW_SHOWMINNOACTIVE = 7;
+  int SW_SHOWNA = 8;
+  int SW_SHOWNOACTIVATE = 4;
+  int SW_SHOWNORMAL = 1;
+
+  /** File not found. */
+  int SE_ERR_FNF = 2;
+
+  /** Path not found. */
+  int SE_ERR_PNF = 3;
+
+  /** Access denied. */
+  int SE_ERR_ACCESSDENIED = 5;
+
+  /** Out of memory. */
+  int SE_ERR_OOM = 8;
+
+  /** DLL not found. */
+  int SE_ERR_DLLNOTFOUND = 32;
+
+  /** Cannot share an open file. */
+  int SE_ERR_SHARE = 26;
+
+  int SEE_MASK_NOCLOSEPROCESS = 0x00000040;
+
+  int ShellExecute(int i, String lpVerb, String lpFile, String lpParameters,
+                   String lpDirectory, int nShow);
+
+  boolean ShellExecuteEx(SHELLEXECUTEINFO lpExecInfo);
+
+  public static class SHELLEXECUTEINFO extends Structure {
+    /*
+     * DWORD cbSize;
+     * ULONG fMask;
+     * HWND hwnd;
+     * LPCTSTR lpVerb;
+     * LPCTSTR lpFile;
+     * LPCTSTR lpParameters;
+     * LPCTSTR lpDirectory;
+     * int nShow;
+     * HINSTANCE hInstApp;
+     * LPVOID lpIDList;
+     * LPCTSTR lpClass;
+     * HKEY hkeyClass;
+     * DWORD dwHotKey;
+     * union {
+     * HANDLE hIcon;
+     * HANDLE hMonitor;
+     * } DUMMYUNIONNAME;
+     * HANDLE hProcess;
+     */
+
+    public int cbSize = size();
+    public int fMask;
+    public HWND hwnd;
+    public WString lpVerb;
+    public WString lpFile;
+    public WString lpParameters;
+    public WString lpDirectory;
+    public int nShow;
+    public HINSTANCE hInstApp;
+    public Pointer lpIDList;
+    public WString lpClass;
+    public HKEY hKeyClass;
+    public int dwHotKey;
+
+    /*
+     * Actually:
+     * union {
+     * HANDLE hIcon;
+     * HANDLE hMonitor;
+     * } DUMMYUNIONNAME;
+     */
+    public HANDLE hMonitor;
+    public HANDLE hProcess;
+
+    protected List getFieldOrder() {
+      return Arrays.asList(new String[] {
+          "cbSize",
+          "fMask",
+          "hwnd",
+          "lpVerb",
+          "lpFile",
+          "lpParameters",
+          "lpDirectory",
+          "nShow",
+          "hInstApp",
+          "lpIDList",
+          "lpClass",
+          "hKeyClass",
+          "dwHotKey",
+          "hMonitor",
+          "hProcess",
+      });
+    }
+  }
+}
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@ -0,0 +1,395 @@
+package net.i2p.router;
+
+import static net.i2p.update.UpdateType.*;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.*;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+import net.i2p.app.ClientAppManager;
+import net.i2p.crypto.*;
+import net.i2p.i2pfirefox.*;
+import net.i2p.router.Router;
+import net.i2p.router.RouterLaunch;
+import net.i2p.update.*;
+import net.i2p.update.UpdateManager;
+import net.i2p.update.UpdatePostProcessor;
+
+/**
+ * Launches a router from %PROGRAMFILES%/I2P using configuration data in
+ * %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
+ *
+ * Sets the following properties:
+ * i2p.dir.base - this points to the (read-only) resources inside the bundle
+ * i2p.dir.config this points to the (read-write) config directory in local
+ * appdata
+ * router.pid - the pid of the java process.
+ */
+public class WinLauncher extends CopyConfigDir {
+  static WindowsUpdatePostProcessor wupp = null;
+  private static Router i2pRouter;
+
+  public static void main(String[] args) {
+    setupLauncher();
+    initLogger();
+    int privateBrowsing = 0;
+    boolean usabilityMode = false;
+    boolean chromiumFirst = false;
+    int proxyTimeoutTime = 200;
+    ArrayList<String> newArgsList = new ArrayList<String>();
+
+    if (args != null) {
+      if (args.length > 0) {
+        for (String arg : args) {
+          if (arg.equals("-private")) {
+            privateBrowsing = 1;
+            logger.info(
+                "Private browsing is true, profile will be discarded at end of session.");
+          } else if (arg.equals("-chromium")) {
+            chromiumFirst = true;
+            logger.info("Chromium will be selected before Firefox.");
+          } else if (arg.equals("-usability")) {
+            usabilityMode = true;
+            logger.info(
+                "Usability mode is true, using alternate extensions loadout.");
+          } else if (arg.equals("-noproxycheck")) {
+            proxyTimeoutTime = 0;
+            logger.info("Proxy timeout time set to zero");
+          } else {
+            // make an effort to not let people launch into sites if the proxy
+            // isn't quite ready yet, but also disable the proxy timeout if
+            // they're reaching a router console
+            if (arg.startsWith("http://localhost:76")) {
+              newArgsList.add(arg);
+              proxyTimeoutTime = 0;
+            } else if (arg.startsWith("http://127.0.0.1:76")) {
+              newArgsList.add(arg);
+              proxyTimeoutTime = 0;
+            } else if (arg.startsWith("https://localhost:76")) {
+              newArgsList.add(arg);
+              proxyTimeoutTime = 0;
+            } else if (arg.startsWith("https://127.0.0.1:76")) {
+              newArgsList.add(arg);
+              proxyTimeoutTime = 0;
+            } else if (proxyTimeoutTime > 0) {
+              newArgsList.add(arg);
+            } else if (!isAvailable(4444)) {
+              newArgsList.add(arg);
+            }
+          }
+        }
+      }
+    }
+
+    File programs = programFile();
+    File home = homeDir();
+
+    System.setProperty("i2p.dir.base", programs.getAbsolutePath());
+    System.setProperty("i2p.dir.config", home.getAbsolutePath());
+    System.setProperty("router.pid",
+                       String.valueOf(ProcessHandle.current().pid()));
+    /**
+     * IMPORTANT: You must set user.dir to the same directory where the
+     * jpackage is intstalled, or when the launcher tries to re-run itself
+     * to start the browser, it will start in the wrong directory and fail
+     * to find the JVM and Runtime bundle. This broke Windows 11 installs.
+     */
+    System.setProperty("user.dir", programs.getAbsolutePath());
+    logger.info("\t" + System.getProperty("user.dir"));
+    logger.info("\t" + System.getProperty("i2p.dir.base"));
+    logger.info("\t" + System.getProperty("i2p.dir.config"));
+    logger.info("\t" + System.getProperty("router.pid"));
+    boolean continuerunning = promptServiceStartIfAvailable("i2p");
+    if (!continuerunning) {
+      logger.severe(
+          "Service startup failure, please start I2P service with services.msc");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
+    continuerunning = promptUserInstallStartIfAvailable();
+    if (!continuerunning) {
+      logger.severe("User-install startup required.");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
+
+    // This actually does most of what we use NSIS for if NSIS hasn't
+    // already done it, which essentially makes this whole thing portable.
+    if (!copyConfigDir()) {
+      logger.severe("Cannot copy the configuration directory");
+      System.exit(1);
+    }
+
+    if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
+                      proxyTimeoutTime, newArgsList)) {
+      System.exit(0);
+    }
+    i2pRouter = new Router(routerConfig(), System.getProperties());
+    if (!isInstalled("i2p")) {
+      if (i2pRouter.saveConfig("routerconsole.browser", null)) {
+        logger.info("removed routerconsole.browser config");
+      }
+      if (i2pRouter.saveConfig("routerconsole.browser",
+                               appImageExe() + " -noproxycheck")) {
+        logger.info("updated routerconsole.browser config " + appImageExe());
+      }
+    }
+    logger.info("Router is configured");
+
+    Thread registrationThread = new Thread(REGISTER_UPP);
+    registrationThread.setName("UPP Registration");
+    registrationThread.setDaemon(true);
+    registrationThread.start();
+
+    setNotStarting();
+
+    i2pRouter.runRouter();
+  }
+
+  private static void fixServiceConfig() {
+    if (osName() != "windows")
+      return;
+    // If the user installed the Easy bundle before installing the
+    // IzPack installer, then they have a config file which contains the
+    // wrong update URL. Check for it, and change it back if necessary.
+    // closes #23
+    String routerconf = routerConfig();
+    if (routerconf != null) {
+      File routerconffile = new File(routerconf);
+      if (!routerconffile.exists()) {
+        return;
+      }
+    } else {
+      return;
+    }
+    if (isInstalled("i2p") || checkProgramFilesInstall()) {
+      i2pRouter = new Router(routerconf, System.getProperties());
+      String newsURL = i2pRouter.getConfigSetting("router.newsURL");
+      if (newsURL != null) {
+        if (newsURL.contains("http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3")) {
+          logger.info(
+              "checked router.newsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.newsURL", ServiceUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String backupNewsURL = i2pRouter.getConfigSetting("router.backupNewsURL");
+      if (backupNewsURL != null) {
+        if (backupNewsURL.contains("http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3")) {
+          logger.info(
+              "checked router.backupNewsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.backupNewsURL",
+                                   ServiceBackupUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String updateURL = i2pRouter.getConfigSetting("router.updateURL");
+      if (updateURL != null) {
+        if (updateURL.contains("http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3")) {
+          logger.info(
+              "checked router.updateURL config, containes easy-intall update in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.updateURL",
+                                   ServiceStaticUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+    }
+  }
+
+  private static void setupLauncher() {
+    File jrehome = javaHome();
+    logger.info("jre home is: " + jrehome.getAbsolutePath());
+    File appimagehome = appImageHome();
+    logger.info("appimage home is: " + appimagehome.getAbsolutePath());
+  }
+
+  private static File programFile() {
+    File programs = selectProgramFile();
+    if (!programs.exists())
+      programs.mkdirs();
+    else if (!programs.isDirectory()) {
+      logger.warning(
+          programs +
+          " exists but is not a directory. Please get it out of the way");
+      System.exit(1);
+    }
+    return programs;
+  }
+
+  private static File homeDir() {
+    File home = selectHome();
+    if (!home.exists())
+      home.mkdirs();
+    else if (!home.isDirectory()) {
+      logger.warning(
+          home +
+          " exists but is not a directory. Please get it out of the way");
+      System.exit(1);
+    }
+    return home;
+  }
+
+  private static boolean launchBrowser(int privateBrowsing,
+                                       boolean usabilityMode,
+                                       boolean chromiumFirst,
+                                       int proxyTimeoutTime,
+                                       ArrayList<String> newArgsList) {
+    if (i2pIsRunning()) {
+      logger.info("I2P is already running, launching an I2P browser");
+      I2PBrowser i2pBrowser = new I2PBrowser();
+      i2pBrowser.usability = usabilityMode;
+      i2pBrowser.chromiumFirst = chromiumFirst;
+      i2pBrowser.firefox = !chromiumFirst;
+      i2pBrowser.chromium = chromiumFirst;
+      if (chromiumFirst) {
+        logger.warning("favoring Chromium instead of Firefox");
+      }
+      i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime);
+      System.out.println("I2PBrowser");
+      String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]);
+      setNotStarting();
+      i2pBrowser.launch(privateBrowsing, newArgs);
+      return true;
+    }
+    return false;
+  }
+
+  // see
+  // https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
+  private static boolean isAvailable(int portNr) {
+    boolean portFree;
+    try (var ignored = new ServerSocket(portNr)) {
+      portFree = true;
+    } catch (IOException e) {
+      portFree = false;
+    }
+    return portFree;
+  }
+
+  private static boolean i2pIsRunningCheck() {
+    // check if there's something listening on port 7657(Router Console)
+    if (!isAvailable(7657))
+      return true;
+    // check if there's something listening on port 7654(I2CP)
+    if (!isAvailable(7654))
+      return true;
+    if (checkPing())
+      return true;
+    return false;
+  }
+
+  private static void setNotStarting() {
+    logger.info("removing startup file, the application has started");
+    File home = selectHome();
+    File starting = new File(home, "starting");
+    if (starting.exists()) {
+      starting.delete();
+    }
+  }
+
+  private static void setStarting() {
+    logger.info("creating startup file, router is starting up");
+    File home = selectHome();
+    File starting = new File(home, "starting");
+    if (!starting.exists()) {
+      try {
+        starting.createNewFile();
+      } catch (IOException e) {
+        logger.info(e.toString());
+      }
+    }
+  }
+
+  private static boolean checkStarting() {
+    logger.info("checking startup file");
+    File home = selectHome();
+    File starting = new File(home, "starting");
+    if (starting.exists()) {
+      logger.info("startup file exists, I2P is already starting up");
+      return true;
+    }
+    logger.info("startup file does not exist but we're running now");
+    setStarting();
+    return false;
+  }
+
+  // check for the existence of router.ping file, if it's less then 2
+  // minutes old, exit
+  private static boolean checkPing() {
+    File home = selectHome();
+    File ping = new File(home, "router.ping");
+    if (ping.exists()) {
+      long diff = System.currentTimeMillis() - ping.lastModified();
+      if (diff > 60 * 1000) {
+        logger.info(
+            "router.ping exists and is more than 1 minute old, I2P does not appear to be running.");
+        logger.info("If I2P is running, report this as a bug.");
+        return false;
+      } else {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static boolean i2pIsRunning() {
+    if (checkStarting())
+      return true;
+    if (checkPing())
+      return true;
+    if (i2pIsRunningCheck())
+      return true;
+    for (int i = 0; i < 10; i++) {
+      if (i2pIsRunningCheck())
+        return true;
+      sleep(1000);
+    }
+    return false;
+  }
+
+  private static final Runnable REGISTER_UPP = () -> {
+    RouterContext ctx;
+    while ((ctx = i2pRouter.getContext()) == null) {
+      sleep(1000);
+    }
+    // then wait for the update manager
+    ClientAppManager cam;
+    while ((cam = ctx.clientAppManager()) == null) {
+      sleep(1000);
+    }
+    UpdateManager um;
+    while ((um = (UpdateManager)cam.getRegisteredApp(UpdateManager.APP_NAME)) ==
+           null) {
+      sleep(1000);
+    }
+    WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
+    um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
+    um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
+  };
+
+  /**
+   * sleep for 1 second
+   *
+   * @param millis
+   */
+  private static void sleep(int millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException bad) {
+      bad.printStackTrace();
+      throw new RuntimeException(bad);
+    }
+  }
+}
--- a/java/net/i2p/router/WinUpdateProcess.java
+++ b/java/net/i2p/router/WinUpdateProcess.java
@ -0,0 +1,89 @@
+package net.i2p.router;
+
+import java.io.*;
+import java.util.Map;
+import java.util.function.*;
+import net.i2p.I2PAppContext;
+import net.i2p.router.*;
+import net.i2p.util.Log;
+
+class WinUpdateProcess implements Runnable {
+  private final RouterContext ctx;
+  private final Supplier<String> versionSupplier;
+  private final Supplier<File> fileSupplier;
+  private final Log _log;
+
+  WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier,
+                   Supplier<File> fileSupplier) {
+    this.ctx = ctx;
+    this.versionSupplier = versionSupplier;
+    this.fileSupplier = fileSupplier;
+    this._log = ctx.logManager().getLog(WinUpdateProcess.class);
+  }
+
+  private File workDir() throws IOException {
+    if (ctx != null) {
+      File workDir =
+          new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      if (workDir.exists()) {
+        if (workDir.isFile())
+          throw new IOException(workDir +
+                                " exists but is a file, get it out of the way");
+        return workDir;
+      } else {
+        workDir.mkdirs();
+      }
+      return workDir;
+    }
+    return null;
+  }
+
+  private void runUpdateInstaller() throws IOException {
+    String version = versionSupplier.get();
+    File file = fileSupplier.get();
+    if (file == null)
+      return;
+
+    File workingDir = workDir();
+    File logFile = new File(workingDir, "log-" + version + ".txt");
+
+    if (logFile.canWrite()) {
+      // check if we can write to the log file. If we can, use the
+      // ProcessBuilder to run the installer.
+      ProcessBuilder pb = new ProcessBuilder(
+          file.getAbsolutePath(), "/S", "/D=" + workingDir.getAbsolutePath());
+      Map<String, String> env = pb.environment();
+      env.put("OLD_I2P_VERSION", version);
+      env.remove("RESTART_I2P");
+
+      int exitCode = ctx.router().scheduledGracefulExitCode();
+      if (exitCode == Router.EXIT_HARD_RESTART ||
+          exitCode == Router.EXIT_GRACEFUL_RESTART)
+        env.put("RESTART_I2P", "true");
+
+      try {
+        pb.directory(workingDir)
+            .redirectErrorStream(true)
+            .redirectOutput(logFile)
+            .start();
+      } catch (IOException ex) {
+        _log.error(
+            "Unable to run update-program in background. Update will fail.");
+      }
+    } else {
+      // If we cant write to the log file and we're on Windows, use the elevator
+      // to execute the installer instead of the ProcessBuilder.
+      Elevator.executeAsAdministrator(file.getAbsolutePath(),
+                                      " /S /D=" + workingDir.getAbsolutePath());
+    }
+  }
+
+  @Override
+  public void run() {
+    try {
+      runUpdateInstaller();
+    } catch (IOException ioe) {
+      _log.error("Error running updater, update may fail." + ioe);
+    }
+  }
+}
--- a/java/net/i2p/router/WindowsServiceUtil.java
+++ b/java/net/i2p/router/WindowsServiceUtil.java
@ -0,0 +1,279 @@
+package net.i2p.router;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import javax.swing.JOptionPane;
+
+/*
+ * Provides querying of Windows services in order to discover I2P Routers
+ * running as a service and avoid launching jpackaged routers redundantly.
+ * It will prompt a user to start their I2P service if one is discovered.
+ *
+ * see also:
+ * https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/sc-query
+ * https://learn.microsoft.com/en-us/dotnet/api/system.serviceprocess.servicecontrollerstatus?view=dotnet-plat-ext-6.0
+ * https://stackoverflow.com/questions/10604844/how-to-verify-whether-service-exists-in-services-msc
+ * C#, API ideas only
+ * https://stackoverflow.com/questions/334471/need-a-way-to-check-status-of-windows-service-programmatically
+ * https://stackoverflow.com/questions/5388888/find-status-of-windows-service-from-java-application
+ * https://stackoverflow.com/questions/21566847/how-to-check-particular-windows-service-is-running-using
+ * https://stackoverflow.com/questions/9792051/start-windows-service-with-java
+ *
+ * There's a chance we can't tell ServiceController to do anything so if
+ * that is the case then we'll just launch services.msc and tell the user to
+ * take it from there.
+ *
+ * @author idk
+ * @since 1.9.7
+ */
+
+public class WindowsServiceUtil {
+  public WindowsServiceUtil() {}
+  public static String queryService(String serviceName) {
+    String result = "";
+    String line;
+    ProcessBuilder pb = new ProcessBuilder("sc", "query", serviceName);
+    try {
+      Process p = pb.start();
+      try {
+        p.waitFor(); // wait for process to finish then continue.
+        BufferedReader bri =
+            new BufferedReader(new InputStreamReader(p.getInputStream()));
+        while ((line = bri.readLine()) != null) {
+          result += line;
+        }
+      } catch (InterruptedException e) {
+        System.err.println(e.toString());
+      } catch (IOException e) {
+        System.err.println(e.toString());
+      }
+    } catch (IOException e) {
+      System.err.println(e.toString());
+    }
+    return result;
+  }
+  public static String getStatePrefix(String qResult) {
+    String statePrefix = "STATE              : ";
+    // get the first occurrence of "STATE", then find the
+    // next occurrence of of ":" after that. Count the
+    // spaces between.
+    int indexOfState = qResult.indexOf("STATE");
+    if (indexOfState >= 0) {
+      int indexOfColon = qResult.indexOf(":", indexOfState);
+      statePrefix = "STATE";
+      for (int f = indexOfState + 5; f < indexOfColon; f++) {
+        statePrefix += " ";
+      }
+      statePrefix += ": ";
+    }
+    return statePrefix;
+  }
+  public static int getServiceStateInt(String serviceName) {
+    // String statePrefix = "STATE              : ";
+    String qResult = queryService(serviceName);
+    String statePrefix = getStatePrefix(qResult);
+    // check that the temp string contains the status prefix
+    int ix = qResult.indexOf(statePrefix);
+    if (ix >= 0) {
+      // compare status number to one of the states
+      String stateStr = qResult.substring(ix + statePrefix.length(),
+                                          ix + statePrefix.length() + 1);
+      int state = Integer.parseInt(stateStr);
+      return state;
+    }
+    return -2;
+  }
+
+  public static boolean isInstalled(String serviceName) {
+    if (getServiceState(serviceName).equals("uninstalled")) {
+      return false;
+    }
+    return true;
+  }
+
+  public static boolean isStart(String serviceName) {
+    if (getServiceState(serviceName).equals("started")) {
+      return true;
+    }
+    if (getServiceState(serviceName).equals("starting")) {
+      return true;
+    }
+    if (getServiceState(serviceName).equals("resuming")) {
+      return true;
+    }
+    return false;
+  }
+
+  public static boolean promptServiceStartIfAvailable(String serviceName) {
+    if (osName() != "windows") {
+      return true;
+    }
+    if (isInstalled(serviceName)) {
+      if (!isStart(serviceName)) {
+        int a;
+        String message =
+            "It appears you have an existing I2P service installed.\n";
+        message +=
+            "However, it is not running yet. Please start it through `services.msc`.\n";
+        message +=
+            "If you click \"No\", the jpackage router will be launched instead.\n";
+        a = JOptionPane.showConfirmDialog(null, message,
+                                          "I2P Service detected not running",
+                                          JOptionPane.YES_NO_OPTION);
+        if (a == JOptionPane.NO_OPTION) {
+          // Do nothing here, this will continue on to launch a jpackaged router
+          return true;
+        } else {
+          // We can't just call `net start` or `sc start` directly, that throws
+          // a permission error. We can start services.msc though, where the
+          // user can start the service themselves. OR maybe we ask for
+          // elevation here? May need to refactor Elevator and Shell32X to
+          // achieve it though
+          ProcessBuilder pb =
+              new ProcessBuilder("C:\\Windows\\System32\\services.msc");
+          try {
+            Process p = pb.start();
+            int exitCode = p.waitFor();
+            if (exitCode != 0) {
+              return false;
+            }
+          } catch (IOException e) {
+            return false;
+          } catch (InterruptedException e) {
+            return false;
+          }
+        }
+        return isStart("i2p");
+      }
+      return true;
+    }
+    return true;
+  }
+
+  public static String ServiceUpdaterString() {
+    return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
+  }
+  public static String ServiceBackupUpdaterString() {
+    return "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news.su3";
+  }
+  public static String ServiceStaticUpdaterString() {
+    return "http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud";
+  }
+
+  public static String getProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return programFilesI2P.getAbsolutePath();
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return programFiles86I2P.getAbsolutePath();
+    }
+    return null;
+  }
+
+  public static boolean checkProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return true;
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return true;
+    }
+    return false;
+  }
+
+  public static boolean promptUserInstallStartIfAvailable() {
+    if (osName() != "windows") {
+      return true;
+    }
+    if (checkProgramFilesInstall()) {
+      int a;
+      String message =
+          "It appears you have an existing, unbundled I2P rotuer installed.\n";
+      message +=
+          "However, it is not running yet. Please start it using the shortcut on the desktop.\n";
+      message +=
+          "If you click \"No\", the jpackage router will be launched instead.\n";
+      a = JOptionPane.showConfirmDialog(null, message,
+                                        "I2P Service detected not running",
+                                        JOptionPane.YES_NO_OPTION);
+      if (a == JOptionPane.NO_OPTION) {
+        // Do nothing here, this will continue on to launch a jpackaged router
+        return true;
+      } else {
+        try {
+          String pfi = getProgramFilesInstall();
+          if (pfi != null)
+            Runtime.getRuntime().exec(pfi);
+        } catch (IOException e) {
+          return false;
+        }
+        return true;
+      }
+    }
+    return true;
+  }
+
+  public static String getServiceState(String serviceName) {
+    String stateString = "uninstalled";
+    int state = getServiceStateInt(serviceName);
+    switch (state) {
+    case (1): // service stopped
+      stateString = "stopped";
+      break;
+    case (2): // service starting
+      stateString = "starting";
+      break;
+    case (3): // service stopping
+      stateString = "stopping";
+      break;
+    case (4): // service started
+      stateString = "started";
+      break;
+    case (5): // service resuming from pause
+      stateString = "resuming";
+      break;
+    case (6): // service pausing
+      stateString = "pausing";
+      break;
+    case (7): // service paused
+      stateString = "paused";
+      break;
+    }
+    return stateString;
+  }
+
+  /**
+   * get the OS name(windows, mac, linux only)
+   *
+   * @return os name in lower-case, "windows" "mac" or  "linux"
+   */
+  protected static String osName() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    if (osName.contains("windows"))
+      return "windows";
+    if (osName.contains("mac"))
+      return "mac";
+    return "linux";
+  }
+  public static void main(String args[]) {
+    // when querying the I2P router service installed by the IzPack installer
+    // this is the correct call.
+    String state = getServiceState("i2p");
+    int stateInt = getServiceStateInt("i2p");
+    System.out.println("i2p state: " + state + " code: " + stateInt);
+    promptServiceStartIfAvailable("i2p");
+  }
+}
--- a/java/net/i2p/router/WindowsUpdatePostProcessor.java
+++ b/java/net/i2p/router/WindowsUpdatePostProcessor.java
@ -0,0 +1,100 @@
+package net.i2p.router;
+
+import static net.i2p.update.UpdateType.*;
+
+import java.io.*;
+import java.lang.InterruptedException;
+import java.lang.Process;
+import java.lang.ProcessBuilder;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.*;
+import net.i2p.I2PAppContext;
+import net.i2p.crypto.*;
+import net.i2p.update.UpdatePostProcessor;
+import net.i2p.update.UpdateType;
+import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
+
+public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
+  private final Log _log;
+  private final RouterContext ctx;
+  private final AtomicBoolean hook = new AtomicBoolean();
+  private final String fileName = "i2p-jpackage-update.exe";
+
+  private volatile String version;
+
+  private volatile File positionedFile = null;
+
+  WindowsUpdatePostProcessor(RouterContext ctx) {
+    this.ctx = ctx;
+    this._log = ctx.logManager().getLog(WindowsUpdatePostProcessor.class);
+  }
+
+  public String getVersion() { return version; }
+
+  public File getFile() { return positionedFile; }
+
+  public void updateDownloadedandVerified(UpdateType type, int fileType,
+                                          String version, File file)
+      throws IOException {
+    _log.info("Got an update to post-process");
+    if (SystemVersion.isWindows()) {
+
+      if (type != UpdateType.ROUTER_SIGNED_SU3 &&
+          type != UpdateType.ROUTER_DEV_SU3) {
+        _log.warn("Unsupported update type " + type);
+        return;
+      }
+
+      if (fileType != SU3File.TYPE_EXE) {
+        _log.warn("Unsupported file type " + fileType);
+        return;
+      }
+
+      this.positionedFile = moveUpdateInstaller(file);
+      this.version = version;
+
+      if (!hook.compareAndSet(false, true)) {
+        _log.info("shutdown hook was already set");
+        return;
+      }
+
+      _log.info("adding shutdown hook");
+
+      ctx.addFinalShutdownTask(
+          new WinUpdateProcess(ctx, this::getVersion, this::getFile));
+    }
+  }
+
+  private File moveUpdateInstaller(File file) throws IOException {
+    if (this.ctx != null) {
+      File newFile = new File(workDir(), fileName);
+      boolean renamedStatus = file.renameTo(newFile);
+      if (renamedStatus)
+        return newFile;
+      else
+        throw new IOException(
+            "WindowsUpdatePostProcesssor unable to move file to working directory, update will fail");
+    }
+    throw new IOException(
+        "Router context not available to WindowsUpdatePostProcesssor, unable to find working directory, update will fail");
+  }
+
+  private File workDir() throws IOException {
+    if (this.ctx != null) {
+      File workDir =
+          new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      if (workDir.exists()) {
+        if (workDir.isFile())
+          throw new IOException(workDir +
+                                " exists but is a file, get it out of the way");
+        return null;
+      } else {
+        workDir.mkdirs();
+      }
+      return workDir;
+    }
+    return null;
+  }
+}
--- a/launcher.sh
+++ b/launcher.sh
@ -0,0 +1,89 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+COUNT="Ten Nine Eight Seven Six Five Four Three Two One"
+
+which java
+export JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ')
+
+if [ "$JAVA" -lt "14" ]; then
+  echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
+  exit 1
+fi
+if [ "$JAVA" -lt "17" ]; then
+  echo "It is highly recommended that you use Java 17+ to build release packages"
+fi
+
+if [ -z "${JAVA_HOME}" ]; then
+  export JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+fi
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  export JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+fi
+echo "Building with: $JAVA, $JAVA_HOME"
+sleep 5s
+
+HERE="$PWD"
+if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
+  git clone --depth=1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
+  tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
+fi
+cd "$HERE/../i2p.i2p.jpackage-build/"
+git pull --all
+for i in $COUNT; do
+  echo -n "$i...."; sleep 1s
+done
+ant distclean pkg || true
+
+cd "$HERE"
+export I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
+export RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
+export I2P_JARS="$I2P_PKG/lib"
+export I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+
+echo "compiling custom launcher"
+mkdir -p build
+cp "$I2P_JARS"/*.jar build
+if [ ! -f "$HERE/build/jna.jar" ]; then
+  wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
+fi
+
+if [ ! -f "$HERE/build/jna-platform.jar" ]; then
+  wget -O "$HERE/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar"
+fi
+
+if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
+  wget -O "$HERE/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
+fi
+
+cd java
+"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+  net/i2p/router/CopyConfigDir.java \
+  net/i2p/router/Elevator.java \
+  net/i2p/router/Shell32X.java \
+  net/i2p/router/WinLauncher.java \
+  net/i2p/router/WindowsUpdatePostProcessor.java \
+  net/i2p/router/WinUpdateProcess.java \
+  net/i2p/router/WindowsServiceUtil.java
+
+cd ..
+
+#echo "building launcher.jar"
+cd build
+"$JAVA_HOME"/bin/jar -cf launcher.jar net
+cd ..
--- a/license/ABOUT-Jetty.html
+++ b/license/ABOUT-Jetty.html
@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>19 May, 2009</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;) as well as the Apache Software License Version 2.0.  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.  A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.  For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
--- a/license/EPL.txt
+++ b/license/EPL.txt
@ -0,0 +1,88 @@
+
+Eclipse Public License - v 2.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+1. DEFINITIONS
+
+“Contribution” means:
+
+    a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+        i) changes to the Program, and
+        ii) additions to the Program;
+    where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof.
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+    e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+    a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+    b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+        i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+        ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+        iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+        iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+    a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+    b) a copy of this Agreement must be included with each copy of the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (‘notices’) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Contributor”) hereby agrees to defend and indemnify every other Contributor (“Indemnified Contributor”) against any losses, damages and costs (collectively “Losses”) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+Exhibit A – Form of Secondary Licenses Notice
+
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+    Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+    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.
+
--- a/license/GPL+CLASSPATH.txt
+++ b/license/GPL+CLASSPATH.txt
@ -0,0 +1,393 @@
+
+GNU General Public License, version 2,
+with the Classpath Exception
+
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  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.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute 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 and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+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 a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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.
+
+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 convey 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 2 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, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision 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, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This 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 Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
+
+
+
+
+ADDITIONAL INFORMATION ABOUT LICENSING
+
+Certain files distributed by Oracle America, Inc. and/or its affiliates are
+subject to the following clarification and special exception to the GPLv2,
+based on the GNU Project exception for its Classpath libraries, known as the
+GNU Classpath Exception.
+
+Note that Oracle includes multiple, independent programs in this software
+package.  Some of those programs are provided under licenses deemed
+incompatible with the GPLv2 by the Free Software Foundation and others.
+For example, the package includes programs licensed under the Apache
+License, Version 2.0 and may include FreeType. Such programs are licensed
+to you under their original licenses.
+
+Oracle facilitates your further distribution of this package by adding the
+Classpath Exception to the necessary parts of its GPLv2 code, which permits
+you to use that code in combination with other independent modules not
+licensed under the GPLv2. However, note that this would not permit you to
+commingle code under an incompatible license with Oracle's GPLv2 licensed
+code by, for example, cutting and pasting such code into a file also
+containing Oracle's GPLv2 licensed code and then distributing the result.
+
+Additionally, if you were to remove the Classpath Exception from any of the
+files to which it applies and distribute the result, you would likely be
+required to license some or all of the other code in that distribution under
+the GPLv2 as well, and since the GPLv2 is incompatible with the license terms
+of some items included in the distribution by Oracle, removing the Classpath
+Exception could therefore effectively compromise your ability to further
+distribute the package.
+
+Failing to distribute notices associated with some files may also create
+unexpected legal consequences.
+
+Proceed with caution and we recommend that you obtain the advice of a lawyer
+skilled in open source matters before removing the Classpath Exception or
+making modifications to this package which may subsequently be redistributed
+and/or involve the use of third party software.
+
--- a/license/I2P.txt
+++ b/license/I2P.txt
@ -0,0 +1,357 @@
+This product includes both public domain code and licensed code as described below.
+For all code, unless otherwise stated in the appropriate license, the following applies:
+
+
+                            NO WARRANTY
+
+  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+
+
+LICENSES
+--------
+
+Core API (i2p.jar):
+Public domain except as listed below:
+
+   ElGamal and DSA code:
+   Copyright (c) 2003, TheCrypto
+   See licenses/LICENSE-ElGamalDSA.txt
+
+   ElGamal:
+   Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+   See licenses/LICENSE-SHA256.txt
+
+   AES code:
+   Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+   See licenses/LICENSE-Cryptix.txt
+
+   Crypto filters:
+   From the xlattice app - http://xlattice.sourceforge.net/
+   See licenses/LICENSE-BSD.txt
+
+   SNTP code:
+   Copyright (c) 2004, Adam Buckley
+   See licenses/LICENSE-SNTP.txt
+
+   PRNG:
+   Copyright (C) 2001, 2002, Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv2.1.txt or /usr/share/common-licenses/LGPL-2.1
+
+   HashCash code:
+   Copyright 2006 Gregory Rubin grrubin@gmail.com
+   See licenses/LICENSE-HashCash.txt
+
+   GettextResource from gettext v0.19.8:
+   (not included in most distribution packages)
+   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   SSLEepGet:
+   Contains some code Copyright 2006 Sun Microsystems, Inc.
+   See licenses/LICENSE-InstallCert.txt
+
+   SipHashInline:
+   Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
+   See licenses/LICENSE-Apache2.0.txt
+
+   Getopt:
+   (not included in most distribution packages)
+   Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com)
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   EdDSA-Java:
+   See licenses/LICENSE-CC0-1.0-Universal.txt
+
+   HostnameVerifier:
+   From Apache HttpClient 4.4.1 and HttpCore 4.4.1
+   See licenses/LICENSE-Apache2.0.txt
+
+   json-simple 2.3.0
+   (not included in most distribution packages)
+   Copyright 2016 Clifton Labs
+   See licenses/LICENSE-Apache2.0.txt
+
+   Noise library:
+   Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+   See licenses/LICENSE-Noise.txt
+
+   MiniDNS library 1.0.0
+   This software may be used under the terms of (at your choice)
+   - LGPL version 2 (or later) (see licenses/LICENSE-LGPL2.1.txt)
+   - Apache Software licence (see licenses/LICENSE-Apache2.0.txt)
+   - DWTFYWTPL
+
+
+Router (router.jar):
+Public domain except as listed below:
+   UPnP.java:
+   From freenet
+   See licenses/LICENSE-GPLv2.txt
+
+   UPnP subsystem (CyberLink) 3.0:
+   Copyright (C) 2003-2010 Satoshi Konno
+   See licenses/LICENSE-UPnP.txt
+
+   GeoIP API 1.3.1:
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   GeoIP2-java 2.12.0:
+   See licenses/LICENSE-Apache2.0.txt
+
+   Maxmind-DB-Reader-java 1.2.2:
+   See licenses/LICENSE-Apache2.0.txt
+
+   Noise library:
+   Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+   See licenses/LICENSE-Noise.txt
+
+   SparseArray:
+   Copyright (C) 2006 The Android Open Source Project
+   See licenses/LICENSE-Apache2.0.txt
+
+   SSU HMAC:
+   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+   See licenses/LICENSE-SHA256.txt
+
+
+Installer:
+   (not included in distribution packages)
+   Launch4j 3.0.1:
+   (Launch4j is only included in the upstream source package and Windows binaries.
+    Not applicable for non-Windows binaries or Debian/Launchpad packages.)
+   Copyright (c) 2004, 2008 Grzegorz Kowal
+   See licenses/LICENSE-Launch4j.txt (in binary packages)
+   See installer/lib/launch4j/LICENSE.txt (in source packages)
+   The following projects are used by Launch4j...
+        MinGW binutils (http://www.mingw.org/)
+
+        Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)
+
+        Commons Logging (http://jakarta.apache.org/commons/logging/)
+        See licenses/LICENSE-Apache2.0.txt
+        See licenses/NOTICE-Commons-Logging.txt
+
+        XStream (http://xstream.github.io/)
+        Copyright (c) 2003-2004, Joe Walnes
+        See licenses/LICENSE-XStream.txt
+
+        JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
+        Copyright (c) 2002-2004 JGoodies Karsten Lentzsch. All rights reserved.
+        See licenses/LICENSE-JGoodies-Forms.txt
+
+        JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
+        Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
+        See licenses/LICENSE-JGoodies-Looks.txt
+
+        Foxtrot (http://foxtrot.sourceforge.net/)
+        Copyright (c) 2002, Simone Bordet & Marco Cravero. All rights reserved.
+        See licenses/LICENSE-Foxtrot.txt
+
+        Nuvola Icon Theme (http://www.icon-king.com)
+        See licenses/LICENSE-LGPLv2.1.txt
+
+        Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)
+
+   Izpack 4.3.0:
+   Copyright (c) 2001-2008 Julien Ponge
+   See licenses/LICENSE-Apache2.0.txt
+
+
+GeoIP Data:
+   (not included in most distribution packages)
+   IP Geolocation by DB-IP https://db-ip.com/
+   See https://creativecommons.org/licenses/by/4.0/
+
+Launchers:
+   (not included in distribution packages)
+   Copyright (c) 2002-2018 EPFL, Lausanne / Lightbend, Inc. , unless otherwise specified.
+   See licenses/LICENSE-Scala.md
+
+Java Service Wrapper Community Edition 3.5.44:
+   (Windows: 3.5.25)
+   (not included in most distribution packages)
+   Copyright (C) 1999-2020 Tanuki Software, Ltd. All Rights Reserved.
+   See licenses/LICENSE-Wrapper.txt
+
+
+Jbigi Libraries (jbigi.jar):
+   JNI code: public domain.
+
+   GMP 4.3.2 / 5.0.2:
+   Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv3.txt
+   GMP 6.0.0 / 6.1.2 / 6.2.0:
+   See licenses/LICENSE-GPLv2.txt
+
+
+Applications:
+
+   Addressbook (addressbook.jar):
+   Copyright (c) 2004 Ragnarok
+   See licenses/LICENSE-Addressbook.txt
+     BlockFile:
+       Copyright (c) 2006, Matthew Estes
+       See licenses/LICENSE-BlockFile.txt
+
+   Desktopgui (desktopgui.jar):
+   Copyright (c) Mathias De Maré
+   See licenses/LICENSE-DesktopGUI.txt
+
+   Glassfish Standard Tag Library (JSTL) 1.2 (commons-el.jar):
+   (not included in most distribution packages)
+   Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
+   See https://glassfish.dev.java.net/public/CDDL+GPL.html
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PControl
+   See licenses/LICENSE-Apache2.0.txt
+   Includes jBCrypt:
+   Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+   See licenses/LICENSE-jBCrypt.txt
+   Includes jsonrpc2 1.38.1 (base) 1.11 (server)
+   See licenses/LICENSE-Apache2.0.txt
+
+   I2PSnark (i2psnark.jar, i2psnark.war):
+   Copyright (C) 2003 Mark J. Wielaard
+   GPLv2 (or any later version)
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PTunnel (i2ptunnel.jar, i2ptunnel.war):
+   (c) 2003 - 2004 mihi
+   GPLv2 (or any later version) with exception.
+   See licenses/LICENSE-I2PTunnel.txt
+   See licenses/LICENSE-GPLv2.txt
+     I2PTunnel SOCKS Proxy:
+       Copyright (c) 2004 by human
+       GPLv2 (or any later version) with exception.
+       See licenses/LICENSE-I2PTunnel.txt
+       See licenses/LICENSE-GPLv2.txt
+     I2PTunnel UDP and Streamr (i2ptunnel.jar):
+       By welterde.
+       See licenses/LICENSE-GPLv2.txt
+
+   Imagegen (imagegen.war):
+     Identicon:
+       Copyright (c) 2007-2014 Don Park <donpark@docuverse.com>
+       See licenses/LICENSE-Identicon.txt
+     RandomArt:
+       Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
+       Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
+       See licenses/LICENSE-BSD.txt
+     Zxing 3.4.1:
+       See licenses/LICENSE-Apache2.0.txt
+
+   Jetty 9.3.30.v20211001 (jetty-*.jar, org.mortbay.*.jar):
+   (not included in most distribution packages, except for jetty-i2p.jar)
+   See licenses/ABOUT-Jetty.html
+   See licenses/NOTICE-Jetty.html
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/LICENSE-ECLIPSE-1.0.html
+
+   RRD4J 3.8 (jrobin.jar):
+   Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
+   Copyright (c) 2011 The OpenNMS Group, Inc.
+   Copyright 2011 The RRD4J Authors.
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   Ministreaming Lib (mstreaming.jar):
+   By mihi.
+   See licenses/LICENSE-BSD.txt
+
+   Proxyscript (i2pProxy.pac):
+   (not included in distribution packages)
+   By Cervantes.
+   Public domain.
+
+   Router console (routerconsole.jar, routerconsole.war):
+   Public domain.
+
+   Router Console themes:
+       Flag icons:
+         - Jersey and EU flag icons: public domain, courtesy Xrmap flag
+           collection http://www.arvernes.com/wiki/index.php/Xrmap
+         - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
+         - Curaçao, courtesy of David Benbennick, released into the public domain
+         - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
+       FatCow icons: See licenses/LICENSE-FatCowIcons.txt
+       Fugue Icons: See licenses/LICENSE-FugueIcons.txt
+       Feather icons: Copyright (c) 2013-2017 Cole Bemis; see licenses/LICENSE-Feather.txt
+       Fontawesome icons: Copyright (c) 2018 @fontawesome(company) see licenses/LICENSE-fontawesome.txt
+
+   Router Console unthemed, light, and dark theme logos:
+   Copyright (c) 2019 The Invisible Internet Project. All rights reserved.
+   Creative Commons Attribution-ShareAlike 4.0 International License
+   See https://creativecommons.org/licenses/by-sa/4.0/
+
+   Router Console and I2PSnark themes:
+   Some images licensed under a Creative Commons 2.0 license.
+       Silk icons: See licenses/LICENSE-SilkIcons.txt
+
+   Router Console M-Lab subsystem:
+   Copyright 2010 Vuze, Inc.  All rights reserved.
+   See licenses/LICENSE-GPLv2.txt
+
+   Router Console NDT subsystem:
+   Copyright (c) 2003 University of Chicago.  All rights reserved.
+   See licenses/LICENSE-NDT.txt
+   Notice: I2P has changed specified portions of the Software, including the package edu.internet2.ndt.
+
+   SAM (sam.jar):
+   Public domain.
+
+   Streaming Lib (streaming.jar):
+   Public domain.
+
+   SusiDNS (susidns.war):
+   Copyright (C) 2005 <susi23@mail.i2p>
+   GPLv2 (or any later version)
+   See licenses/LICENSE-GPLv2.txt
+
+   SusiMail (susimail.war):
+   Copyright (C) 2004-2005  <susi23@mail.i2p>
+   GPLv2 (or any later version)
+   See licenses/LICENSE-GPLv2.txt
+
+   Systray (systray.jar):
+   Public domain.
+
+   Tomcat 9.0.62 (jasper-runtime.jar):
+   (not included in most distribution packages)
+   Copyright 1999-2022 The Apache Software Foundation
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/NOTICE-Tomcat.txt
+
+
+Other Applications and Libraries
+--------------------------------
+The following applications and libraries are not used or bundled in
+binary packages, therefore the licenses are not included in binary
+distributions. See the source package for the additional license information.
+
+   Admin Manager:
+   Public domain
+
+   Gradle wrapper 5.2.1:
+   (not included in most distribution packages)
+   Copyright (c) 2017 the original author or authors.
+   See licenses/LICENSE-Apache2.0.txt
--- a/license/LICENSE-Addressbook.txt
+++ b/license/LICENSE-Addressbook.txt
@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * 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
+ * COPYRIGHT HOLDER 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.
+ */
--- a/license/LICENSE-Apache2.0.txt
+++ b/license/LICENSE-Apache2.0.txt
@ -0,0 +1,202 @@
+
+                                 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/license/LICENSE-BSD.txt
+++ b/license/LICENSE-BSD.txt
@ -0,0 +1,27 @@
+Copyright (c) 2009, The I2P 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 I2P 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 OWNER
+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.
--- a/license/LICENSE-BlockFile.txt
+++ b/license/LICENSE-BlockFile.txt
@ -0,0 +1,26 @@
+Copyright (c) 2006, Matthew Estes
+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 Metanotion Software 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 OWNER 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.
--- a/license/LICENSE-Boost.txt
+++ b/license/LICENSE-Boost.txt
@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- a/license/LICENSE-CC0-1.0-Universal.txt
+++ b/license/LICENSE-CC0-1.0-Universal.txt
@ -0,0 +1,123 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
+
+For more information, please see https://creativecommons.org/publicdomain/zero/1.0/
--- a/license/LICENSE-Cryptix.txt
+++ b/license/LICENSE-Cryptix.txt
@ -0,0 +1,28 @@
+Cryptix General License
+
+Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  1. Redistributions of source code must retain the copyright notice,
+     this list of conditions and the following disclaimer.
+  2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED 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 CRYPTIX FOUNDATION LIMITED 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.
--- a/license/LICENSE-DesktopGUI.txt
+++ b/license/LICENSE-DesktopGUI.txt
@ -0,0 +1,15 @@
+Desktop GUI: provides a simple GUI for I2P.
+Copyright (C) 2009  Mathias De Maré
+
+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; only version 2 of the License.
+
+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, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--- a/license/LICENSE-ECLIPSE-1.0.html
+++ b/license/LICENSE-ECLIPSE-1.0.html
@ -0,0 +1,319 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="ProgId" content="Word.Document">
+<meta name="Generator" content="Microsoft Word 9">
+<meta name="Originator" content="Microsoft Word 9">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head><body style="" lang="EN-US">
+
+<div class="Section1">
+
+<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
+
+<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear="left">
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+changes to the Program, and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+additions to the Program;</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style="font-size: 10pt;">"Recipient" means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
+
+<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+its license agreement:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
+
+<p><span style="font-size: 10pt;">When the Program is made available in source
+code form:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it must be made available under this Agreement; and </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style="font-size: 10pt;">Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style="font-size: 10pt;">For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
+
+<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
+
+</div>
+
+</body></html>
--- a/license/LICENSE-ElGamalDSA.txt
+++ b/license/LICENSE-ElGamalDSA.txt
@ -0,0 +1,28 @@
+/* 
+ * Copyright (c) 2003, TheCrypto
+ * 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 TheCrypto 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 OWNER 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.
+ */
--- a/license/LICENSE-FatCowIcons.txt
+++ b/license/LICENSE-FatCowIcons.txt
@ -0,0 +1,22 @@
+FatCow Free "Farm-Fresh Web Icons"
+
+_________________________________________
+FatCow
+http://www.fatcow.com/free-icons
+_________________________________________
+
+These icon sets are licensed under a
+Creative Commons Attribution 3.0 License.
+[ http://creativecommons.org/licenses/by/3.0/ ]
+
+This means you can freely use these icons for
+any purpose, private and commercial, including
+online services, templates, themes and software.
+However, you should include a link to this page
+in your credits.
+
+The icons may not be resold, sub-licensed, rented,
+transferred or otherwise made available for use.
+
+Please link to this page on fatcow.com if you
+would like to spread the word.
--- a/license/LICENSE-Feather.txt
+++ b/license/LICENSE-Feather.txt
@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2017 Cole Bemis
+
+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.
--- a/license/LICENSE-Foxtrot.txt
+++ b/license/LICENSE-Foxtrot.txt
@ -0,0 +1,25 @@
+Copyright (c) 2002, Simone Bordet & Marco Cravero
+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 Foxtrot nor the names of the 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 REGENTS 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.
--- a/license/LICENSE-FugueIcons.txt
+++ b/license/LICENSE-FugueIcons.txt
@ -0,0 +1,80 @@
+Fugue Icons
+
+(C) 2013 Yusuke Kamiyamane. All rights reserved.
+
+These icons are licensed under a Creative Commons
+Attribution 3.0 License.
+<http://creativecommons.org/licenses/by/3.0/>
+
+If you can't or don't want to provide attribution, please
+purchase a royalty-free license.
+<http://p.yusukekamiyamane.com/>
+
+I'm unavailable for custom icon design work. But your
+suggestions are always welcome!
+<mailto:p@yusukekamiyamane.com>
+
+------------------------------------------------------------
+
+All logos and trademarks in some icons are property of their
+respective owners.
+
+------------------------------------------------------------
+
+- geotag
+
+  (C) Geotag Icon Project. All rights reserved.
+  <http://www.geotagicons.com/>
+
+  Geotag icon is licensed under a Creative Commons
+  Attribution-Share Alike 3.0 License or LGPL.
+  <http://creativecommons.org/licenses/by-sa/3.0/>
+  <http://opensource.org/licenses/lgpl-license.php>
+
+- language
+
+  (C) Language Icon Project. All rights reserved.
+  <http://www.languageicon.org/>
+
+  Language icon is licensed under a Creative Commons
+  Attribution-Share Alike 3.0 License.
+  <http://creativecommons.org/licenses/by-sa/3.0/>
+
+- open-share
+
+  (C) Open Share Icon Project. All rights reserved.
+  <http://www.openshareicons.com/>
+
+  Open Share icon is licensed under a Creative Commons
+  Attribution-Share Alike 3.0 License.
+  <http://creativecommons.org/licenses/by-sa/3.0/>
+
+- opml
+
+  (C) OPML Icon Project. All rights reserved.
+  <http://opmlicons.com/>
+
+  OPML icon is licensed under a Creative Commons
+  Attribution-Share Alike 2.5 License.
+  <http://creativecommons.org/licenses/by-sa/2.5/>
+
+- share
+
+  (C) Share Icon Project. All rights reserved.
+  <http://shareicons.com/>
+
+  Share icon is licensed under a GPL or LGPL or BSD or
+  Creative Commons Attribution 2.5 License.
+  <http://opensource.org/licenses/gpl-license.php>
+  <http://opensource.org/licenses/lgpl-license.php>
+  <http://opensource.org/licenses/bsd-license.php>
+  <http://creativecommons.org/licenses/by/2.5/>
+
+- xfn
+
+  (C) Wolfgang Bartelme. All rights reserved.
+  <http://www.bartelme.at/>
+
+  XFN icon is licensed under a Creative Commons
+  Attribution-Share Alike 2.5 License.
+  <http://creativecommons.org/licenses/by-sa/2.5/>
--- a/license/LICENSE-GPLv2.txt
+++ b/license/LICENSE-GPLv2.txt
@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  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.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+		     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
+convey 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 2 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, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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 Library General
+Public License instead of this License.
--- a/license/LICENSE-GPLv3.txt
+++ b/license/LICENSE-GPLv3.txt
@ -0,0 +1,674 @@
+                    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/license/LICENSE-HashCash.txt
+++ b/license/LICENSE-HashCash.txt
@ -0,0 +1,2 @@
+   Copyright 2006 Gregory Rubin grrubin@gmail.com
+   Permission is given to use, modify, and or distribute this code so long as this message remains attached
--- a/license/LICENSE-I2PTunnel.txt
+++ b/license/LICENSE-I2PTunnel.txt
@ -0,0 +1,29 @@
+/*
+ * I2PTunnel
+ * (c) 2003 - 2004 mihi
+ *
+ * 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 2, 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * In addition, as a special exception, mihi gives permission to link
+ * the code of this program with the proprietary Java implementation
+ * provided by Sun (or other vendors as well), and distribute linked
+ * combinations including the two. You must obey the GNU General
+ * Public License in all respects for all of the code used other than
+ * the proprietary Java implementation. If you modify this file, you
+ * may extend this exception to your version of the file, but you are
+ * not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
--- a/license/LICENSE-Identicon.txt
+++ b/license/LICENSE-Identicon.txt
@ -0,0 +1,46 @@
+Identicon
+=========
+
+###License
+
+
+        (The MIT License)
+        
+        Copyright (c) 2007-2014 Don Park <donpark@docuverse.com>
+        Contributor   2014-2014 Paulo Miguel Almeida Rodenas <paulo.ubuntu@gmail.com>
+        
+        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.
+        
+###Compiling and Running it
+
+ On root path run this:
+
+        mvn clean install
+
+ To run the example webapp run this in /webappexample folder
+
+        mvn clean compile package tomcat7:run -Ptomcat
+
+ Example Urls
+
+        http://localhost:8080/9block?code=-2034984870&size=64
+        http://localhost:8080/9block?code=-2034954870&size=64
+        http://localhost:8080/9block?code=-2034894870&size=64
+
--- a/license/LICENSE-InstallCert.txt
+++ b/license/LICENSE-InstallCert.txt
@ -0,0 +1,29 @@
+Copyright 2006 Sun Microsystems, Inc.  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 Sun Microsystems 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 OWNER 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.
+
--- a/license/LICENSE-JGoodies-Forms.txt
+++ b/license/LICENSE-JGoodies-Forms.txt
@ -0,0 +1,31 @@
+
+              The BSD License for the JGoodies Forms
+              ======================================
+
+Copyright (c) 2002-2004 JGoodies Karsten Lentzsch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ o Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer. 
+    
+ o 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. 
+    
+ o Neither the name of JGoodies Karsten Lentzsch 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 OWNER 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.
--- a/license/LICENSE-JGoodies-Looks.txt
+++ b/license/LICENSE-JGoodies-Looks.txt
@ -0,0 +1,31 @@
+
+              The BSD License for the JGoodies Looks
+              ======================================
+
+Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ o Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer. 
+    
+ o 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. 
+    
+ o Neither the name of JGoodies Karsten Lentzsch 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 OWNER 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.
--- a/license/LICENSE-LGPLv2.1.txt
+++ b/license/LICENSE-LGPLv2.1.txt
@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey 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 library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
--- a/license/LICENSE-LGPLv3.txt
+++ b/license/LICENSE-LGPLv3.txt
@ -0,0 +1,165 @@
+		   GNU LESSER 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.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
--- a/license/LICENSE-Launch4j.txt
+++ b/license/LICENSE-Launch4j.txt
@ -0,0 +1,23 @@
+Copyright (c) 2004, 2007 Grzegorz Kowal
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright holders
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization.
+
+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.
--- a/license/LICENSE-Ministreaming.txt
+++ b/license/LICENSE-Ministreaming.txt
@ -0,0 +1,10 @@
+$Id$
+
+the i2p/apps/ministreaming module is the root of the 
+ministreaming library, and everything within it 
+is released according to the terms of the I2P 
+license policy.  That means everything contained 
+within the i2p/apps/ministreaming module is released 
+under a BSD license unless otherwise marked.  
+Alternate licenses that may be used include Cryptix, 
+MIT, as well as code granted into the public domain.
--- a/license/LICENSE-NDT.txt
+++ b/license/LICENSE-NDT.txt
@ -0,0 +1,49 @@
+Copyright (c) 2003 University of Chicago.  All rights reserved.
+The Web100 Network Diagnostic Tool (NDT) is distributed subject to the
+following license conditions:
+SOFTWARE LICENSE AGREEMENT
+Software: Web100 Network Diagnostic Tool (NDT)
+1. The "Software", below, refers to the Web100 Network Diagnostic Tool
+   (NDT) (in either source code, or binary form and accompanying documentation).
+   Each licensee is addressed as "you" or "Licensee."
+2. The copyright holder shown above hereby grants Licensee a royalty-free
+   nonexclusive license, subject to the limitations stated herein and U.S.
+   Government license rights.
+3. You may modify and make a copy or copies of the Software for use within
+   your organization, if you meet the following conditions: 
+    a. Copies in source code must include the copyright notice and this Software
+       License Agreement.
+    b. Copies in binary form must include the copyright notice and this Software
+       License Agreement in the documentation and/or other materials provided with the copy.
+4. You may make a copy, or modify a copy or copies of the Software or any
+   portion of it, thus forming a work based on the Software, and distribute
+   copies outside your organization, if you meet all of the following conditions: 
+    a. Copies in source code must include the copyright notice and this Software
+       License Agreement;
+    b. Copies in binary form must include the copyright notice and this Software
+       License Agreement in the documentation and/or other materials provided with the copy;
+    c. Modified copies and works based on the Software must carry prominent
+       notices stating that you changed specified portions of the Software.
+5. Portions of the Software resulted from work developed under a U.S.
+   Government contract and are subject to the following license: the Government
+   is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+   irrevocable worldwide license in this computer software to reproduce, prepare
+   derivative works, and perform publicly and display publicly.
+6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF
+   ANY KIND. THE COPYRIGHT HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+   OF ENERGY, AND THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME
+   ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+   USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD
+   NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE
+   WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED.
+7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDER, THE UNITED
+   STATES, THE UNITED STATES DEPARTMENT OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE
+   FOR ANY INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY
+   KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA,
+   FOR ANY REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF
+   CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, EVEN
+   IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES.
+The Software was developed at least in part by the University of Chicago, as
+Operator of Argonne National Laboratory (http://miranda.ctd.anl.gov:7123/). 
--- a/license/LICENSE-Noise.txt
+++ b/license/LICENSE-Noise.txt
@ -0,0 +1,19 @@
+Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+
+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.
--- a/license/LICENSE-SHA256.txt
+++ b/license/LICENSE-SHA256.txt
@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+ * (http://www.bouncycastle.org)
+ *
+ * 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.
+ *
+ */
--- a/license/LICENSE-SNTP.txt
+++ b/license/LICENSE-SNTP.txt
@ -0,0 +1,43 @@
+> Date: Fri, 13 Aug 2004 15:58:30 +1200 (NZST)
+> Message-ID: <1776.202.37.75.101.1092369510.squirrel@202.37.75.101>
+> From: adam@adambuckley.net
+> To: jrandom@i2p.net
+>
+> [...]
+>
+> I hereby authorize my NtpClient.java and NtpMessage.java code to be
+> redistributed under the BSD license for the purpose of integration with
+> the I2P project, providing that I am credited as the original author of
+> the code.
+>
+> [...]
+
+/*
+ * Copyright (c) 2004, Adam Buckley
+ * 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 Adam Buckley 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 OWNER 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.
+ *
+ */
--- a/license/LICENSE-SilkIcons.txt
+++ b/license/LICENSE-SilkIcons.txt
@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
--- a/license/LICENSE-UPnP.txt
+++ b/license/LICENSE-UPnP.txt
@ -0,0 +1,21 @@
+Copyright (c) 2003-2010, Satoshi Konno
+
+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 Cyber Garage 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 OWNER 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.
--- a/license/LICENSE-Undraw.txt
+++ b/license/LICENSE-Undraw.txt
@ -0,0 +1,22 @@
+Copyright 2019 Katerina Limpitsouni
+
+All images, assets and vectors published on unDraw can be used for free. You can
+use them for noncommercial and commercial purposes. You do not need to ask
+permission from or provide credit to the creator or unDraw.
+
+More precisely, unDraw grants you an nonexclusive, worldwide copyright license
+to download, copy, modify, distribute, perform, and use the assets provided from
+unDraw for free, including for commercial purposes, without permission from or
+attributing the creator or unDraw. This license does not include the right to
+compile assets, vectors or images from unDraw to replicate a similar or
+competing service, in any form or distribute the assets in packs. This extends
+to automated and non-automated ways to link, embed, scrape, search or download
+the assets included on the website without our consent. Brand logos that are
+included:
+
+Are registered trademarks of their respected owners. Are included on a
+promotional basis and do not represent an association with unDraw or its users.
+Do not indicate any kind of endorsement of the trademark holder towards unDraw,
+nor vice versa. Are provided with the sole purpose to represent the actual
+brand/service/company that has registered the trademark and must not be used
+otherwise.
--- a/license/LICENSE-Wrapper.txt
+++ b/license/LICENSE-Wrapper.txt
--- a/license/LICENSE-XStream.txt
+++ b/license/LICENSE-XStream.txt
@ -0,0 +1,27 @@
+(BSD Style License)
+
+Copyright (c) 2003-2004, Joe Walnes
+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 XStream 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 OWNER 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.
--- a/license/LICENSE-fontawesome.txt
+++ b/license/LICENSE-fontawesome.txt
@ -0,0 +1,766 @@
+Fontawesome license file:
+
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+    wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public:
+    wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+
+
+======================================================================
+======================================================================
+
+As the list of changed icons was too extensive to fit into either a
+mtn checkin or into the history.txt, they are appended here for
+reference.
+
+./i2p.i2p/installer/themes/console/dark/images/eye.png
+./i2p.i2p/installer/themes/console/dark/images/sort_up.png
+./i2p.i2p/installer/themes/console/dark/images/dropdown.png
+./i2p.i2p/installer/themes/console/dark/images/magnet.png
+./i2p.i2p/installer/themes/console/dark/images/sort_down.png
+./i2p.i2p/installer/themes/console/dark/images/link.png
+./i2p.i2p/installer/themes/console/light/images/server.png
+./i2p.i2p/installer/themes/console/light/images/eye.png
+./i2p.i2p/installer/themes/console/light/images/sort_up.png
+./i2p.i2p/installer/themes/console/light/images/application.png
+./i2p.i2p/installer/themes/console/light/images/dropdown.png
+./i2p.i2p/installer/themes/console/light/images/magnet.png
+./i2p.i2p/installer/themes/console/light/images/sort_down.png
+./i2p.i2p/installer/themes/console/light/images/link.png
+./i2p.i2p/installer/themes/console/images/trac_wiki.png
+./i2p.i2p/installer/themes/console/images/world.png
+./i2p.i2p/installer/themes/console/images/echelon.png
+./i2p.i2p/installer/themes/console/images/server.png
+./i2p.i2p/installer/themes/console/images/i2pwiki_logo.png
+./i2p.i2p/installer/themes/console/images/outbound.png
+./i2p.i2p/installer/themes/console/images/plugin.png
+./i2p.i2p/installer/themes/console/images/paste_plain.png
+./i2p.i2p/installer/themes/console/images/chart_bar.png
+./i2p.i2p/installer/themes/console/images/book_addresses.png
+./i2p.i2p/installer/themes/console/images/chart_line.png
+./i2p.i2p/installer/themes/console/images/group.png
+./i2p.i2p/installer/themes/console/images/inbound.png
+./i2p.i2p/installer/themes/console/images/buttons/clean.png
+./i2p.i2p/installer/themes/console/images/buttons/shutdown.png
+./i2p.i2p/installer/themes/console/images/buttons/unban.png
+./i2p.i2p/installer/themes/console/images/buttons/filter.png
+./i2p.i2p/installer/themes/console/images/buttons/no.png
+./i2p.i2p/installer/themes/console/images/buttons/dump-threads.png
+./i2p.i2p/installer/themes/console/images/buttons/edit.png
+./i2p.i2p/installer/themes/console/images/buttons/search.png
+./i2p.i2p/installer/themes/console/images/buttons/go.png
+./i2p.i2p/installer/themes/console/images/buttons/create-file.png
+./i2p.i2p/installer/themes/console/images/buttons/helper.png
+./i2p.i2p/installer/themes/console/images/buttons/back.png
+./i2p.i2p/installer/themes/console/images/buttons/user.png
+./i2p.i2p/installer/themes/console/images/buttons/add_address.png
+./i2p.i2p/installer/themes/console/images/buttons/create.png
+./i2p.i2p/installer/themes/console/images/buttons/Xstop.png
+./i2p.i2p/installer/themes/console/images/buttons/add.png
+./i2p.i2p/installer/themes/console/images/buttons/password.png
+./i2p.i2p/installer/themes/console/images/buttons/users.png
+./i2p.i2p/installer/themes/console/images/buttons/configure.png
+./i2p.i2p/installer/themes/console/images/buttons/show.png
+./i2p.i2p/installer/themes/console/images/buttons/delete.png
+./i2p.i2p/installer/themes/console/images/buttons/restart.png
+./i2p.i2p/installer/themes/console/images/buttons/edit2.png
+./i2p.i2p/installer/themes/console/images/buttons/from-file.png
+./i2p.i2p/installer/themes/console/images/buttons/hide.png
+./i2p.i2p/installer/themes/console/images/buttons/update.png
+./i2p.i2p/installer/themes/console/images/buttons/restore.png
+./i2p.i2p/installer/themes/console/images/buttons/Xstart.png
+./i2p.i2p/installer/themes/console/images/buttons/yes.png
+./i2p.i2p/installer/themes/console/images/buttons/ban.png
+./i2p.i2p/installer/themes/console/images/buttons/download.png
+./i2p.i2p/installer/themes/console/images/buttons/floodfill.png
+./i2p.i2p/installer/themes/console/images/buttons/fullview.png
+./i2p.i2p/installer/themes/console/images/buttons/link.png
+./i2p.i2p/installer/themes/console/images/education.png
+./i2p.i2p/installer/themes/console/images/email.png
+./i2p.i2p/installer/themes/console/images/eepsite.png
+./i2p.i2p/installer/themes/console/images/i2pgit.png
+./i2p.i2p/installer/themes/console/images/paste.png
+./i2p.i2p/installer/themes/console/images/cursor_zoom.png
+./i2p.i2p/installer/themes/console/images/info/from_file.png
+./i2p.i2p/installer/themes/console/images/info/reboot.png
+./i2p.i2p/installer/themes/console/images/info/launch_browser.png
+./i2p.i2p/installer/themes/console/images/info/statistics.png
+./i2p.i2p/installer/themes/console/images/info/control.png
+./i2p.i2p/installer/themes/console/images/info/server.png
+./i2p.i2p/installer/themes/console/images/info/power.png
+./i2p.i2p/installer/themes/console/images/info/home.png
+./i2p.i2p/installer/themes/console/images/info/bandwidth.png
+./i2p.i2p/installer/themes/console/images/info/java_edit.png
+./i2p.i2p/installer/themes/console/images/info/box.png
+./i2p.i2p/installer/themes/console/images/info/newspaper.png
+./i2p.i2p/installer/themes/console/images/info/blocked.png
+./i2p.i2p/installer/themes/console/images/info/floodfill_32x32.png
+./i2p.i2p/installer/themes/console/images/info/family.png
+./i2p.i2p/installer/themes/console/images/info/rosette.png
+./i2p.i2p/installer/themes/console/images/info/console.png
+./i2p.i2p/installer/themes/console/images/info/systray.png
+./i2p.i2p/installer/themes/console/images/info/key.png
+./i2p.i2p/installer/themes/console/images/info/leave_family.png
+./i2p.i2p/installer/themes/console/images/info/configure.png
+./i2p.i2p/installer/themes/console/images/info/notice.png
+./i2p.i2p/installer/themes/console/images/info/label.png
+./i2p.i2p/installer/themes/console/images/info/author.png
+./i2p.i2p/installer/themes/console/images/info/experimental.png
+./i2p.i2p/installer/themes/console/images/info/update.png
+./i2p.i2p/installer/themes/console/images/info/backlogged.png
+./i2p.i2p/installer/themes/console/images/info/connect.png
+./i2p.i2p/installer/themes/console/images/info/url.png
+./i2p.i2p/installer/themes/console/images/info/user_add.png
+./i2p.i2p/installer/themes/console/images/info/interval.png
+./i2p.i2p/installer/themes/console/images/info/debug.png
+./i2p.i2p/installer/themes/console/images/info/keys.png
+./i2p.i2p/installer/themes/console/images/info/wizard.png
+./i2p.i2p/installer/themes/console/images/info/gateway.png
+./i2p.i2p/installer/themes/console/images/info/logs.png
+./i2p.i2p/installer/themes/console/images/info/export_key.png
+./i2p.i2p/installer/themes/console/images/info/question.png
+./i2p.i2p/installer/themes/console/images/info/client.png
+./i2p.i2p/installer/themes/console/images/info/bugreport.png
+./i2p.i2p/installer/themes/console/images/support.png
+./i2p.i2p/installer/themes/console/images/group_gear.png
+./i2p.i2p/installer/themes/console/images/bug.png
+./i2p.i2p/installer/themes/console/images/folder.png
+./i2p.i2p/installer/themes/console/images/title_window.png
+./i2p.i2p/installer/themes/console/images/i2psnark.png
+./i2p.i2p/installer/themes/console/images/info_rhombus.png
+./i2p.i2p/installer/themes/console/images/glass.png
+./i2p.i2p/installer/themes/console/images/billiard_marker.png
+./i2p.i2p/installer/themes/console/images/server_32x32.png
+./i2p.i2p/installer/themes/console/images/box_open.png
+./i2p.i2p/installer/themes/console/images/question.png
+./i2p.i2p/installer/themes/console/images/client.png
+./i2p.i2p/installer/themes/snark/dark/images/clock.png
+./i2p.i2p/installer/themes/snark/dark/images/last.png
+./i2p.i2p/installer/themes/snark/dark/images/stalled.png
+./i2p.i2p/installer/themes/snark/dark/images/previous.png
+./i2p.i2p/installer/themes/snark/dark/images/downloading.png
+./i2p.i2p/installer/themes/snark/dark/images/peer.png
+./i2p.i2p/installer/themes/snark/dark/images/button_forum.png
+./i2p.i2p/installer/themes/snark/dark/images/infocircle.png
+./i2p.i2p/installer/themes/snark/dark/images/create.png
+./i2p.i2p/installer/themes/snark/dark/images/showpeers.png
+./i2p.i2p/installer/themes/snark/dark/images/add.png
+./i2p.i2p/installer/themes/snark/dark/images/details.png
+./i2p.i2p/installer/themes/snark/dark/images/configuration.png
+./i2p.i2p/installer/themes/snark/dark/images/next.png
+./i2p.i2p/installer/themes/snark/dark/images/dropdown.png
+./i2p.i2p/installer/themes/snark/dark/images/create0.png
+./i2p.i2p/installer/themes/snark/dark/images/file.png
+./i2p.i2p/installer/themes/snark/dark/images/snark_add.png
+./i2p.i2p/installer/themes/snark/dark/images/delete.png
+./i2p.i2p/installer/themes/snark/dark/images/first.png
+./i2p.i2p/installer/themes/snark/dark/images/bullet.png
+./i2p.i2p/installer/themes/snark/dark/images/eta.png
+./i2p.i2p/installer/themes/snark/dark/images/remove.png
+./i2p.i2p/installer/themes/snark/dark/images/start.png
+./i2p.i2p/installer/themes/snark/dark/images/up.png
+./i2p.i2p/installer/themes/snark/dark/images/snark_create.png
+./i2p.i2p/installer/themes/snark/dark/images/rateme.png
+./i2p.i2p/installer/themes/snark/dark/images/seeding.png
+./i2p.i2p/installer/themes/snark/dark/images/nopeers.png
+./i2p.i2p/installer/themes/snark/dark/images/author.png
+./i2p.i2p/installer/themes/snark/dark/images/status.png
+./i2p.i2p/installer/themes/snark/dark/images/file_sm.png
+./i2p.i2p/installer/themes/snark/dark/images/stop.png
+./i2p.i2p/installer/themes/snark/dark/images/debug.png
+./i2p.i2p/installer/themes/snark/dark/images/trackererror.png
+./i2p.i2p/installer/themes/snark/dark/images/comment.png
+./i2p.i2p/installer/themes/snark/dark/images/size.png
+./i2p.i2p/installer/themes/snark/dark/images/button_tracker.png
+./i2p.i2p/installer/themes/snark/dark/images/stopped.png
+./i2p.i2p/installer/themes/snark/dark/images/hidepeers.png
+./i2p.i2p/installer/themes/snark/dark/images/complete.png
+./i2p.i2p/installer/themes/snark/light/images/clock.png
+./i2p.i2p/installer/themes/snark/light/images/last.png
+./i2p.i2p/installer/themes/snark/light/images/stalled.png
+./i2p.i2p/installer/themes/snark/light/images/previous.png
+./i2p.i2p/installer/themes/snark/light/images/downloading.png
+./i2p.i2p/installer/themes/snark/light/images/peer.png
+./i2p.i2p/installer/themes/snark/light/images/button_forum.png
+./i2p.i2p/installer/themes/snark/light/images/infocircle.png
+./i2p.i2p/installer/themes/snark/light/images/create.png
+./i2p.i2p/installer/themes/snark/light/images/showpeers.png
+./i2p.i2p/installer/themes/snark/light/images/add.png
+./i2p.i2p/installer/themes/snark/light/images/details.png
+./i2p.i2p/installer/themes/snark/light/images/configuration.png
+./i2p.i2p/installer/themes/snark/light/images/next.png
+./i2p.i2p/installer/themes/snark/light/images/dropdown.png
+./i2p.i2p/installer/themes/snark/light/images/file.png
+./i2p.i2p/installer/themes/snark/light/images/snark_add.png
+./i2p.i2p/installer/themes/snark/light/images/delete.png
+./i2p.i2p/installer/themes/snark/light/images/first.png
+./i2p.i2p/installer/themes/snark/light/images/bullet.png
+./i2p.i2p/installer/themes/snark/light/images/eta.png
+./i2p.i2p/installer/themes/snark/light/images/remove.png
+./i2p.i2p/installer/themes/snark/light/images/start.png
+./i2p.i2p/installer/themes/snark/light/images/up.png
+./i2p.i2p/installer/themes/snark/light/images/snark_create.png
+./i2p.i2p/installer/themes/snark/light/images/rateme.png
+./i2p.i2p/installer/themes/snark/light/images/seeding.png
+./i2p.i2p/installer/themes/snark/light/images/nopeers.png
+./i2p.i2p/installer/themes/snark/light/images/author.png
+./i2p.i2p/installer/themes/snark/light/images/status.png
+./i2p.i2p/installer/themes/snark/light/images/stop.png
+./i2p.i2p/installer/themes/snark/light/images/debug.png
+./i2p.i2p/installer/themes/snark/light/images/trackererror.png
+./i2p.i2p/installer/themes/snark/light/images/comment.png
+./i2p.i2p/installer/themes/snark/light/images/size.png
+./i2p.i2p/installer/themes/snark/light/images/button_tracker.png
+./i2p.i2p/installer/themes/snark/light/images/stopped.png
+./i2p.i2p/installer/themes/snark/light/images/hidepeers.png
+./i2p.i2p/installer/themes/snark/light/images/complete.png
+./i2p.i2p/installer/themes/snark/vanilla/images/clock.png
+./i2p.i2p/installer/themes/snark/vanilla/images/last.png
+./i2p.i2p/installer/themes/snark/vanilla/images/stalled.png
+./i2p.i2p/installer/themes/snark/vanilla/images/previous.png
+./i2p.i2p/installer/themes/snark/vanilla/images/downloading.png
+./i2p.i2p/installer/themes/snark/vanilla/images/peer.png
+./i2p.i2p/installer/themes/snark/vanilla/images/button_forum.png
+./i2p.i2p/installer/themes/snark/vanilla/images/infocircle.png
+./i2p.i2p/installer/themes/snark/vanilla/images/create.png
+./i2p.i2p/installer/themes/snark/vanilla/images/showpeers.png
+./i2p.i2p/installer/themes/snark/vanilla/images/add.png
+./i2p.i2p/installer/themes/snark/vanilla/images/details.png
+./i2p.i2p/installer/themes/snark/vanilla/images/configuration.png
+./i2p.i2p/installer/themes/snark/vanilla/images/next.png
+./i2p.i2p/installer/themes/snark/vanilla/images/dropdown.png
+./i2p.i2p/installer/themes/snark/vanilla/images/file.png
+./i2p.i2p/installer/themes/snark/vanilla/images/snark_add.png
+./i2p.i2p/installer/themes/snark/vanilla/images/delete.png
+./i2p.i2p/installer/themes/snark/vanilla/images/first.png
+./i2p.i2p/installer/themes/snark/vanilla/images/bullet.png
+./i2p.i2p/installer/themes/snark/vanilla/images/eta.png
+./i2p.i2p/installer/themes/snark/vanilla/images/remove.png
+./i2p.i2p/installer/themes/snark/vanilla/images/start.png
+./i2p.i2p/installer/themes/snark/vanilla/images/up.png
+./i2p.i2p/installer/themes/snark/vanilla/images/snark_create.png
+./i2p.i2p/installer/themes/snark/vanilla/images/rateme.png
+./i2p.i2p/installer/themes/snark/vanilla/images/seeding.png
+./i2p.i2p/installer/themes/snark/vanilla/images/nopeers.png
+./i2p.i2p/installer/themes/snark/vanilla/images/author.png
+./i2p.i2p/installer/themes/snark/vanilla/images/status.png
+./i2p.i2p/installer/themes/snark/vanilla/images/restore.png
+./i2p.i2p/installer/themes/snark/vanilla/images/stop.png
+./i2p.i2p/installer/themes/snark/vanilla/images/debug.png
+./i2p.i2p/installer/themes/snark/vanilla/images/trackererror.png
+./i2p.i2p/installer/themes/snark/vanilla/images/comment.png
+./i2p.i2p/installer/themes/snark/vanilla/images/size.png
+./i2p.i2p/installer/themes/snark/vanilla/images/button_tracker.png
+./i2p.i2p/installer/themes/snark/vanilla/images/stopped.png
+./i2p.i2p/installer/themes/snark/vanilla/images/hidepeers.png
+./i2p.i2p/installer/themes/snark/vanilla/images/complete.png
+./i2p.i2p/installer/themes/snark/ubergine/images/clock.png
+./i2p.i2p/installer/themes/snark/ubergine/images/last.png
+./i2p.i2p/installer/themes/snark/ubergine/images/stalled.png
+./i2p.i2p/installer/themes/snark/ubergine/images/previous.png
+./i2p.i2p/installer/themes/snark/ubergine/images/cancel.png
+./i2p.i2p/installer/themes/snark/ubergine/images/downloading.png
+./i2p.i2p/installer/themes/snark/ubergine/images/peer.png
+./i2p.i2p/installer/themes/snark/ubergine/images/button_forum.png
+./i2p.i2p/installer/themes/snark/ubergine/images/infocircle.png
+./i2p.i2p/installer/themes/snark/ubergine/images/create.png
+./i2p.i2p/installer/themes/snark/ubergine/images/showpeers.png
+./i2p.i2p/installer/themes/snark/ubergine/images/add.png
+./i2p.i2p/installer/themes/snark/ubergine/images/details.png
+./i2p.i2p/installer/themes/snark/ubergine/images/configuration.png
+./i2p.i2p/installer/themes/snark/ubergine/images/next.png
+./i2p.i2p/installer/themes/snark/ubergine/images/dropdown.png
+./i2p.i2p/installer/themes/snark/ubergine/images/file.png
+./i2p.i2p/installer/themes/snark/ubergine/images/snark_add.png
+./i2p.i2p/installer/themes/snark/ubergine/images/delete.png
+./i2p.i2p/installer/themes/snark/ubergine/images/first.png
+./i2p.i2p/installer/themes/snark/ubergine/images/bullet.png
+./i2p.i2p/installer/themes/snark/ubergine/images/eta.png
+./i2p.i2p/installer/themes/snark/ubergine/images/remove.png
+./i2p.i2p/installer/themes/snark/ubergine/images/start.png
+./i2p.i2p/installer/themes/snark/ubergine/images/up.png
+./i2p.i2p/installer/themes/snark/ubergine/images/snark_create.png
+./i2p.i2p/installer/themes/snark/ubergine/images/rateme.png
+./i2p.i2p/installer/themes/snark/ubergine/images/seeding.png
+./i2p.i2p/installer/themes/snark/ubergine/images/nopeers.png
+./i2p.i2p/installer/themes/snark/ubergine/images/author.png
+./i2p.i2p/installer/themes/snark/ubergine/images/status.png
+./i2p.i2p/installer/themes/snark/ubergine/images/restore.png
+./i2p.i2p/installer/themes/snark/ubergine/images/stop.png
+./i2p.i2p/installer/themes/snark/ubergine/images/debug.png
+./i2p.i2p/installer/themes/snark/ubergine/images/trackererror.png
+./i2p.i2p/installer/themes/snark/ubergine/images/comment.png
+./i2p.i2p/installer/themes/snark/ubergine/images/size.png
+./i2p.i2p/installer/themes/snark/ubergine/images/button_tracker.png
+./i2p.i2p/installer/themes/snark/ubergine/images/stopped.png
+./i2p.i2p/installer/themes/snark/ubergine/images/hidepeers.png
+./i2p.i2p/installer/themes/snark/ubergine/images/complete.png
+./i2p.i2p/installer/themes/susidns/images/drive.png
+./i2p.i2p/installer/themes/susidns/images/configure_24.png
+./i2p.i2p/installer/themes/susidns/images/abook.png
+./i2p.i2p/installer/themes/susidns/images/addressbook.png
+./i2p.i2p/installer/themes/susimail/dark/images/settings.png
+./i2p.i2p/installer/themes/susimail/dark/images/last.png
+./i2p.i2p/installer/themes/susimail/dark/images/previous.png
+./i2p.i2p/installer/themes/susimail/dark/images/account.png
+./i2p.i2p/installer/themes/susimail/dark/images/edit.png
+./i2p.i2p/installer/themes/susimail/dark/images/3down.png
+./i2p.i2p/installer/themes/susimail/dark/images/3up.png
+./i2p.i2p/installer/themes/susimail/dark/images/refresh.png
+./i2p.i2p/installer/themes/susimail/dark/images/logout.png
+./i2p.i2p/installer/themes/susimail/dark/images/next.png
+./i2p.i2p/installer/themes/susimail/dark/images/mail.png
+./i2p.i2p/installer/themes/susimail/dark/images/first.png
+./i2p.i2p/installer/themes/susimail/dark/images/folder.png
+./i2p.i2p/installer/themes/susimail/dark/images/login.png
+./i2p.i2p/installer/themes/susimail/dark/images/offline.png
+./i2p.i2p/installer/themes/susimail/light/images/settings.png
+./i2p.i2p/installer/themes/susimail/light/images/account.png
+./i2p.i2p/installer/themes/susimail/light/images/edit.png
+./i2p.i2p/installer/themes/susimail/light/images/3down.png
+./i2p.i2p/installer/themes/susimail/light/images/book.png
+./i2p.i2p/installer/themes/susimail/light/images/3up.png
+./i2p.i2p/installer/themes/susimail/light/images/refresh.png
+./i2p.i2p/installer/themes/susimail/light/images/logout.png
+./i2p.i2p/installer/themes/susimail/light/images/folder.png
+./i2p.i2p/installer/themes/susimail/light/images/login.png
+./i2p.i2p/installer/themes/susimail/light/images/offline.png
+./i2p.i2p/installer/themes/susimail/images/none.png
+./i2p.i2p/installer/themes/susimail/images/last.png
+./i2p.i2p/installer/themes/susimail/images/send.png
+./i2p.i2p/installer/themes/susimail/images/previous.png
+./i2p.i2p/installer/themes/susimail/images/reply.png
+./i2p.i2p/installer/themes/susimail/images/logout.png
+./i2p.i2p/installer/themes/susimail/images/selection.png
+./i2p.i2p/installer/themes/susimail/images/next.png
+./i2p.i2p/installer/themes/susimail/images/compose.png
+./i2p.i2p/installer/themes/susimail/images/first.png
+./i2p.i2p/installer/themes/susimail/images/attach.png
+./i2p.i2p/installer/themes/susimail/images/status.png
+./i2p.i2p/installer/themes/susimail/images/save.png
+./i2p.i2p/installer/themes/susimail/images/forward.png
+./i2p.i2p/installer/themes/susimail/images/folder-open.png
+./i2p.i2p/installer/themes/susimail/images/folder.png
+./i2p.i2p/installer/themes/susimail/images/login.png
+./i2p.i2p/installer/themes/susimail/images/offline.png
+./i2p.i2p/installer/themes/susimail/images/all.png
+./i2p.i2p/installer/themes/susimail/images/reply-all.png
+./i2p.i2p/installer/resources/themes/console/dark/images/move_bottom.png
+./i2p.i2p/installer/resources/themes/console/dark/images/move_top.png
+./i2p.i2p/installer/resources/themes/console/light/images/inbox.png
+./i2p.i2p/installer/resources/themes/console/light/images/mail_black.png
+./i2p.i2p/installer/resources/themes/console/light/images/news.png
+./i2p.i2p/installer/resources/themes/snark/dark/images/config.png
+./i2p.i2p/installer/resources/themes/susimail/dark/images/help.png
+./i2p.i2p/installer/resources/themes/susimail/light/images/help.png
+./i2p.i2p/apps/i2psnark/resources/icons/clock.png
+./i2p.i2p/apps/i2psnark/resources/icons/plugin.png
+./i2p.i2p/apps/i2psnark/resources/icons/cancel.png
+./i2p.i2p/apps/i2psnark/resources/icons/tick.png
+./i2p.i2p/apps/i2psnark/resources/icons/page_white.png
+./i2p.i2p/apps/i2psnark/resources/icons/application.png
+./i2p.i2p/apps/i2psnark/resources/icons/page.png
+./i2p.i2p/apps/i2psnark/resources/icons/compress.png
+./i2p.i2p/apps/i2psnark/resources/icons/film.png
+./i2p.i2p/apps/i2psnark/resources/icons/magnet.png
+./i2p.i2p/apps/i2psnark/resources/icons/music.png
+./i2p.i2p/apps/i2psnark/resources/icons/basket_put.png
+./i2p.i2p/apps/i2psnark/resources/icons/cd.png
+./i2p.i2p/apps/i2psnark/resources/icons/html.png
+./i2p.i2p/apps/i2psnark/resources/icons/package.png
+./i2p.i2p/apps/i2psnark/resources/icons/folder.png
+./i2p.i2p/apps/i2psnark/resources/icons/photo.png
+./i2p.i2p/apps/i2psnark/resources/icons/ebook.png
+./i2p.i2p/apps/i2psnark/resources/icons/page_white_acrobat.png
+./i2p.i2p/apps/susimail/src/icons/attach.png
--- a/license/LICENSE-forked-subprocess.swift.txt
+++ b/license/LICENSE-forked-subprocess.swift.txt
@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Marco Conti
+
+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.
+
--- a/license/LICENSE-jBCrypt.txt
+++ b/license/LICENSE-jBCrypt.txt
@ -0,0 +1,18 @@
+jBCrypt is subject to the following license:
+
+/*
+ * Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
--- a/license/LICENSE-sbt-wrapper.txt
+++ b/license/LICENSE-sbt-wrapper.txt
@ -0,0 +1,27 @@
+// Generated from http://www.opensource.org/licenses/bsd-license.php
+Copyright (c) 2011, Paul Phillips. 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 author 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.
--- a/license/LICENSE.index
+++ b/license/LICENSE.index
@ -5,11 +5,38 @@ and they are distributed with this package in the "licenses" directory.
  1. MIT License
    * all original material in this repository
  2. Mozilla Public License 2.0(From Mozilla Installer)
-    * ./i2pbrowser-mozcompat.nsi
+    * ./src/win/i2pbrowser-mozcompat.nsi
  3. Modified BSD License(From Tor Browser Bundle)
-    * ./firefox.profile.i2p/user.js
+    * ./src/*/user.js
  4. GNU General Public License 2.0(NoScript and HTTPS Everywhere)
-    * ./firefox.profile.i2p/extensions/
+    * ./src/*/extensions/
  5. GNU General Public License 3.0(Part of HTTPS Everywhere)
-    * ./firefox.profike.i2p/extensions/https-everywhere@eff.org.xpi
+    * ./src/*/extensions/
+  6. GNU GPLv2 With Classpath Exception(Java libraries included via Jpackage)
+    * ./I2P

+Additionally, the Jpackaged I2P Router contains software which is licensed
+under multiple Free/Open Source Software Licenses.
+
+  ABOUT-Jetty.html               LICENSE-ECLIPSE-1.0.html             
+  LICENSE-Addressbook.txt        LICENSE-ElGamalDSA.txt               
+  LICENSE-Apache2.0.txt          LICENSE-FatCowIcons.txt              
+  LICENSE-BlockFile.txt          LICENSE-Feather.txt                  
+  LICENSE-Boost.txt              LICENSE-fontawesome.txt              
+  LICENSE-BSD.txt                LICENSE-forked-subprocess.swift.txt  
+  LICENSE-CC0-1.0-Universal.txt  LICENSE-Foxtrot.txt                  
+  LICENSE-Cryptix.txt            LICENSE-FugueIcons.txt               
+  LICENSE-DesktopGUI.txt         LICENSE-GPLv2.txt                    
+  LICENSE-GPLv3.txt              LICENSE-LGPLv2.1.txt       
+  LICENSE-Launch4j.txt           LICENSE-SilkIcons.txt
+  LICENSE-HashCash.txt           LICENSE-LGPLv3.txt         
+  LICENSE-I2PTunnel.txt          LICENSE-Ministreaming.txt  
+  LICENSE-Identicon.txt          LICENSE-NDT.txt            
+  LICENSE-InstallCert.txt        LICENSE-Noise.txt          
+  LICENSE-jBCrypt.txt            LICENSE-sbt-wrapper.txt    
+  LICENSE-JGoodies-Forms.txt     LICENSE-Scala.md           
+  LICENSE-JGoodies-Looks.txt     LICENSE-SHA256.txt         
+  NOTICE-Tomcat.txt              NOTICE-Jetty.html
+  LICENSE-UPnP.txt               LICENSE-SNTP.txt
+  LICENSE-Wrapper.txt            LICENSE-Undraw.txt
+  LICENSE-XStream.txt            NOTICE-Commons-Logging.txt
--- a/license/NOTICE-Commons-Logging.txt
+++ b/license/NOTICE-Commons-Logging.txt
@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
--- a/license/NOTICE-Jetty.html
+++ b/license/NOTICE-Jetty.html
@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head><body lang="EN-US" link="blue" vlink="purple">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>Unless otherwise indicated, all Content made available by the
+Eclipse Foundation is provided to you under the terms and conditions of
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
+provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse.org CVS
+repository ("Repository") in CVS modules ("Modules") and made available
+as downloadable archives ("Downloads").</p>
+   
+<ul>
+	<li>Content may be structured and packaged into modules to
+facilitate delivering, extending, and upgrading the Content. Typical
+modules may include plug-ins ("Plug-ins"), plug-in fragments
+("Fragments"), and features ("Features").</li>
+	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
+	<li>A
+Feature is a bundle of one or more Plug-ins and/or Fragments and
+associated material. Each Feature may be packaged as a sub-directory in
+a directory named "features". Within a Feature, files named
+"feature.xml" may contain a list of the names and version numbers of
+the Plug-ins and/or Fragments associated with that Feature.</li>
+	<li>Features
+may also include other Features ("Included Features"). Within a
+Feature, files named "feature.xml" may contain a list of the names and
+version numbers of Included Features.</li>
+</ul>   
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be
+contained in files named "about.html" ("Abouts"). The terms and
+conditions governing Features and
+Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+	<li>The top-level (root) directory</li>
+	<li>Plug-in and Fragment directories</li>
+	<li>Inside Plug-ins and Fragments packaged as JARs</li>
+	<li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+	<li>Feature directories</li>
+</ul>
+		
+<p>Note: if a Feature made available by the Eclipse Foundation is
+installed using the Eclipse Update Manager, you must agree to a license
+("Feature Update License") during the
+installation process. If the Feature contains Included Features, the
+Feature Update License should either provide you with the terms and
+conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be
+found in the "license" property of files named "feature.properties"
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the
+terms and conditions (or references to such terms and conditions) that
+govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
+	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions
+govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you
+are currently may have restrictions on the import, possession, and use,
+and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check the country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.</p>
+   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+</body></html>
--- a/license/NOTICE-Tomcat.txt
+++ b/license/NOTICE-Tomcat.txt
@ -0,0 +1,68 @@
+Apache Tomcat
+Copyright 1999-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+This software contains code derived from netty-native
+developed by the Netty project
+(https://netty.io, https://github.com/netty/netty-tcnative/)
+and from finagle-native developed at Twitter
+(https://github.com/twitter/finagle).
+
+This software contains code derived from jgroups-kubernetes
+developed by the JGroups project (http://www.jgroups.org/).
+
+The Windows Installer is built with the Nullsoft
+Scriptable Install System (NSIS), which is
+open source software.  The original software and
+related information is available at
+http://nsis.sourceforge.net.
+
+Java compilation software for JSP pages is provided by the Eclipse
+JDT Core Batch Compiler component, which is open source software.
+The original software and related information is available at
+https://www.eclipse.org/jdt/core/.
+
+org.apache.tomcat.util.json.JSONParser.jj is a public domain javacc grammar
+for JSON written by Robert Fischer.
+https://github.com/RobertFischer/json-parser
+
+For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
+The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
+are derivative work originating from the Netty project and the finagle-native
+project developed at Twitter
+* Copyright 2014 The Netty Project
+* Copyright 2014 Twitter
+
+For portions of the Tomcat cloud support
+The org.apache.catalina.tribes.membership.cloud package contains derivative
+work originating from the jgroups project.
+https://github.com/jgroups-extras/jgroups-kubernetes
+Copyright 2002-2018 Red Hat Inc.
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - jsp_2_2.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
+
+may be obtained from:
+http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
--- a/license/NSS.txt
+++ b/license/NSS.txt
@ -0,0 +1,403 @@
+NSS is available under the Mozilla Public License, version 2, a copy of which
+is below.
+
+Note on GPL Compatibility
+-------------------------
+
+The MPL 2, section 3.3, permits you to combine NSS with code under the GNU
+General Public License (GPL) version 2, or any later version of that
+license, to make a Larger Work, and distribute the result under the GPL.
+The only condition is that you must also make NSS, and any changes you
+have made to it, available to recipients under the terms of the MPL 2 also.
+
+Anyone who receives the combined code from you does not have to continue
+to dual licence in this way, and may, if they wish, distribute under the
+terms of either of the two licences - either the MPL alone or the GPL
+alone. However, we discourage people from distributing copies of NSS under
+the GPL alone, because it means that any improvements they make cannot be
+reincorporated into the main version of NSS. There is never a need to do
+this for license compatibility reasons.
+
+Note on LGPL Compatibility
+--------------------------
+
+The above also applies to combining MPLed code in a single library with
+code under the GNU Lesser General Public License (LGPL) version 2.1, or
+any later version of that license. If the LGPLed code and the MPLed code
+are not in the same library, then the copyleft coverage of the two
+licences does not overlap, so no issues arise.
+
+
+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/makefiles/app-profile.mk
+++ b/makefiles/app-profile.mk
--- a/makefiles/build.mk
+++ b/makefiles/build.mk
--- a/makefiles/debian.mk
+++ b/makefiles/debian.mk
@ -0,0 +1,4 @@
+orig:
+	tar --exclude=debian --exclude=.git -cvzf ../i2p-firefox-profile_$(PROFILE_VERSION).orig.tar.gz .
+
+## HOWTO: Don't bother. See http://i2pgit.org/idk/i2p.plugins.firefox debian jpackages.
--- a/makefiles/docker.mk
+++ b/makefiles/docker.mk
@ -0,0 +1 @@
+# DEPRECATED: see https://i2pgit.org/idk/i2p.plugins.firefox for much better replacement.
--- a/makefiles/extensions.mk
+++ b/makefiles/extensions.mk
@ -0,0 +1 @@
+#DEPRECATED moved to i2p.plugins.firefox as "Base/Strict Mode"
--- a/makefiles/install.mk
+++ b/makefiles/install.mk
@ -0,0 +1,39 @@
+install:
+	install -D -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
+	install -D -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
+	install -D -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
+	install -D -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
+	install -D -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
+	cp -vr build/profile /var/lib/i2pbrowser/profile
+	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
+	cp -vr src/icons /var/lib/i2pbrowser/icons
+	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
+	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
+
+uninstall:
+	rm -rfv /etc/i2pbrowser \
+		/var/lib/i2pbrowser \
+		/etc/i2pbrowser/i2pbrowserrc \
+		/usr/local/bin/i2pbrowser \
+		/usr/local/bin/i2pconfig \
+		/usr/local/bin/i2p-config-service-setup \
+		/usr/share/applications/i2pbrowser.desktop \
+		/usr/share/applications/i2pconfig.desktop
+
+checkinstall: .version
+	checkinstall \
+		--default \
+		--install=no \
+		--fstrans=yes \
+		--pkgname=i2p-firefox \
+		--pkgversion=$(PROFILE_VERSION) \
+		--pkggroup=net \
+		--pkgrelease=1 \
+		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
+		--maintainer="$(SIGNER)" \
+		--requires="firefox,wget" \
+		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
+		--nodoc \
+		--deldoc=yes \
+		--deldesc=yes \
+		--backup=no
--- a/makefiles/new-extensions.mk
+++ b/makefiles/new-extensions.mk
@ -0,0 +1 @@
+#DEPRECATED moved to i2p.plugins.firefox as "Usability Mode"
--- a/makefiles/profile.mk
+++ b/makefiles/profile.mk
--- a/makefiles/su-unsigned.mk
+++ b/makefiles/su-unsigned.mk
@ -0,0 +1,35 @@
+
+prepupdate-unsignedexe:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION).su3" i2pwinupdate-unsignedexe.su3
+
+su3-unsignedexe: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION).exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+i2pwinupdate-unsignedexe.su3.torrent: prepupdate-unsignedexe su3-unsignedexe
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate-unsignedexe.su3
+
+torrent-unsignedexe: i2pwinupdate-unsignedexe.su3.torrent
+
+testing-releases.json: torrent-unsignedexe
+	mkdir -p ../i2p.newsxml/data/win/testing/
+	@echo "["		| tee ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"torrent\": \"$(MAGNET_TESTING)\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
--- a/makefiles/su.mk
+++ b/makefiles/su.mk
@ -0,0 +1,41 @@
+GOPATH=$(HOME)/go
+
+$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
+	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
+	git pull --all
+	cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
+		go mod vendor && go build
+
+prepupdate:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
+
+su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
+
+i2pwinupdate.su3.torrent: prepupdate su3
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3.torrent
+
+releases.json:
+	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"version\": \"$(PROFILE_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
--- a/msi.sh
+++ b/msi.sh
@ -0,0 +1,35 @@
+#! /usr/bin/env sh
+
+## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
+
+# Motivation
+
+. ./config.sh
+. ./i2pversion
+
+./build.sh
+jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
+    --verbose \
+    --java-options "-Xmx512m" \
+    --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
+    $JPACKAGE_OPTS \
+    --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
+    --input build \
+    --verbose \
+    --type msi \
+    --win-dir-chooser \
+    --win-help-url "https://geti2p.net" \
+    --win-menu \
+    --win-menu-group "I2P Easy-Install Bundle" \
+    --win-shortcut \
+    --win-shortcut-prompt \
+    --win-per-user-install \
+    --license-file LICENSE.md \
+    --main-jar launcher.jar \
+    --main-class net.i2p.router.WinLauncher
--- a/release.sh
+++ b/release.sh
@ -0,0 +1,13 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+./unsigned.sh
+./sign.sh
--- a/router.config
+++ b/router.config
@ -0,0 +1,5 @@
+router.updateURL=http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3
+router.newsURL=http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3
+router.backupNewsURL=http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3
+routerconsole.browser=I2P.exe -noproxycheck
+router.disableTunnelTesting=false
--- a/showhider.css
+++ b/showhider.css
@ -0,0 +1,15 @@
+/* edgar showhider CSS file */
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
+
+#donate {display:none; }
+#hidedonate {display:block; }
+#donate:target {display: block; }
+#hidedonate:target {display: none; }
--- a/sign.sh
+++ b/sign.sh
@ -0,0 +1,45 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+linuxsign() {
+    ## LINUX SIGNING IS EXPERIMENTAL AND SHOULD NOT BE USED IN DEFAULT STATE.
+    if [ ! -f jsign-4.1.jar ]; then
+        wget -O jsign-4.1.jar https://github.com/ebourg/jsign/releases/download/4.1/jsign-4.1.jar
+    fi
+    if [ ! -f "$HOME/signingkeys/signing-key.jks" ]; then
+        mkdir -p "$HOME/signingkeys/"
+        keytool -genkey -alias server-alias -keyalg RSA -keypass changeit \
+            -storepass changeit -keystore "$HOME/signingkeys/signing-key.jks"
+    fi
+    java -jar jsign-4.1.jar \
+        --keystore "$HOME/signingkeys/signing-key.jks" \
+        --storepass changeit \
+        --keypass changeit \
+        --tsaurl "http://timestamp.sectigo.com" \
+        --name "I2P-Browser-Installer" \
+        --alg "SHA-512" \
+        "$1"
+}
+
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+    JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+    linuxsign I2P-Easy-Install-Bundle-$I2P_VERSION.exe
+    cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
+else
+    signtool.exe sign -a "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+    cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
+fi
--- a/src/app-profile/chrome/userChrome.css
+++ b/src/app-profile/chrome/userChrome.css
@ -1,26 +1,45 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* only needed once */

-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* only needed once */
@namespace html url("http://www.w3.org/1999/xhtml");
-
-#PersonalToolbar, #PanelUI-Button, #PanelUI-menu-button, #star-button, #forward-button, #home-button, #bookmarks-toolbar-button, #library-button, #sidebar-button, #pocket-button, #fxa-toolbar-menu-button, #reader-mode-button, #identity-icon {
-  visibility: collapse;
+#PersonalToolbar,
+#PanelUI-Button,
+#PanelUI-menu-button,
+#star-button,
+#forward-button,
+#home-button,
+#bookmarks-toolbar-button,
+#library-button,
+#sidebar-button,
+#pocket-button,
+#fxa-toolbar-menu-button,
+#reader-mode-button,
+#identity-icon {
+    visibility: collapse;
+}
+
+#urlbar-background {
+    background-color: black !important;
 }

-#urlbar-background {background-color: black !important;} 

 /* Remove back button circle */
+
 #back-button:not(:hover),
-#back-button:not(:hover) > .toolbarbutton-icon {
-background: transparent !important;
-border: none !important;
-box-shadow: none !important;
+#back-button:not(:hover)>.toolbarbutton-icon {
+    background: transparent !important;
+    border: none !important;
+    box-shadow: none !important;
 }

 #back-button:hover,
-#back-button:hover > .toolbarbutton-icon {
-border: none !important;
-border-radius: 2px !important;
+#back-button:hover>.toolbarbutton-icon {
+    border: none !important;
+    border-radius: 2px !important;
 }

-#urlbar-container, #nav-bar { visibility: collapse !important }
-}   
+#urlbar-container,
+#nav-bar {
+    visibility: collapse !important
+}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`https://addons.mozilla.org/firefox/downloads/file/3716461/2021.4.15/https_everywhere-2021.4.15-an+fx.xpi`
				`@ -0,0 +1 @@`
				`# DEPRECATED: see https://i2pgit.org/idk/i2p.plugins.firefox for much better replacement.`
				`@ -0,0 +1 @@`
				`#DEPRECATED moved to i2p.plugins.firefox as "Base/Strict Mode"`