add instructions for downstream Debians

Restructure the datagram section headers
Add a datagram overview section
Remove bottom section on client libs

.gitignore

@@ -5,3 +5,4 @@
 env/
 i2p2www/translations/*/LC_MESSAGES/*.mo
 *~
+.vscode

.mtn-ignore

@@ -1,9 +0,0 @@
-env
-\.pot\.old$
-\.pyc$
-\.pyo$
-\.mo$
-~$
-\.custom$
-\.wsgi$
-\.pybabel-stamp$

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stable
+FROM debian:buster
 ENV SERVERNAME=geti2p.net
 ENV SERVERMAIL=example@geti2p.net
 
@@ -8,7 +8,7 @@ WORKDIR /var/www/i2p.www
 
     ## Install the dependencies
 RUN apt-get update && \
-    apt-get -y install apache2 apache2-utils libapache2-mod-wsgi python2-dev python-pip patch python-virtualenv git && \
+    apt-get -y install apache2 apache2-utils libapache2-mod-wsgi python2-dev python-pip patch python-virtualenv git python-polib && \
     ## Start setting up the site
     rm -rfv env && \
     virtualenv --distribute env                && \  

README.md

@@ -34,9 +34,7 @@ If you want to mirror the I2P website, thanks! Here is a checklist:
   - In particular, do not change the `CANONICAL_DOMAIN` variable in
     `i2p2www/__init__.py`, it needs to point to the official site for SEO.
 - If you need to edit variables in `etc/update.vars`, copy the file to
-  `etc/update.vars.custom` and edit appropriately. The only variable you
-  may need to edit is `MTNURL` in `etc/update.vars` (if your Monotone client
-  tunnel is listening on a different port).
+  `etc/update.vars.custom` and edit appropriately.
 - If you want to enable caching, copy `i2p2www/settings.py.sample` to
   `i2p2www/settings.py` and edit appropriately.
 - Add `./site-updater.sh` to your crontab. This will keep the site updated,
@@ -99,11 +97,6 @@ in `etc/translation.vars` can be overridden by creating the file
     $ git commit -am "Updated translations"
     ```
 
-    ```
-    # older mtn instructions
-    $ mtn ci `cat newtranslations.txt` -m "Updated translations"
-    ```
-
 6. Check in any new translations:
    First, look to see which translations are supported in i2pwww/__init__.py.
    For any new translations that are NOT in __init__.py,
@@ -115,11 +108,6 @@ in `etc/translation.vars` can be overridden by creating the file
     $ git add i2p2www/translations/* && git commit -am "New translations"
     ```
 
-    ```
-    # older mtn instructions
-    $ mtn add -R i2p2www/translations/ && mtn ci i2p2www/translations/ -m "New translations"
-    ```
-
 ## Pushing updated translation source (.pot) files to Transifex:
 
 1. Update the .pot files with any changes to the website text:
@@ -135,11 +123,6 @@ in `etc/translation.vars` can be overridden by creating the file
     $ git commit -am "Updated translation strings"
     ```
 
-    ```
-    # older mtn instructions
-    $ mtn ci pots/ -m "Updated translation strings"
-    ```
-
 3. Push pots file changes to Transifex:
 
     ```

docker-run-dev.sh

@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+virtualenv --distribute env
+. env/bin/activate
+#./setup_venv.sh
+DEV=on ./runserver.py

i2p2www/__init__.py

@@ -22,8 +22,9 @@ except ImportError:
 ###########
 # Constants
 
-CURRENT_I2P_VERSION = '0.9.48'
-CURRENT_I2P_FIREFOX_PROFILE_VERSION = '0.02b'
+CURRENT_I2P_VERSION = '1.8.0'
+CURRENT_I2P_FIREFOX_PROFILE_VERSION = '1.8.0'
+CURRENT_I2P_OSX_VERSION = '1.8.0'
 
 CANONICAL_DOMAIN = 'geti2p.net'
 
@@ -48,6 +49,7 @@ SUPPORTED_LANGS = [
     'zh_TW',
     'el',
     'he',
+    'hu',
     'it',
     'ja',
     'ko',
@@ -75,6 +77,7 @@ SUPPORTED_LANG_NAMES = {
     'fr': u'Français',
     'el': u'Greek Ελληνικά',
     'he': u'Hebrew עברית',
+    'hu': u'Hungarian',
     'it': u'Italiano',
     'ja': u'Japanese 日本語',
     'ko': u'Korean 한국말',

i2p2www/blog/2010/12/22/release-0.8.2.html

@@ -11,7 +11,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p.
 </p>

i2p2www/blog/2011/01/24/release-0.8.3.html

@@ -17,7 +17,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p.
 </p>

i2p2www/blog/2011/03/02/release-0.8.4.html

@@ -7,7 +7,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>

i2p2www/blog/2011/04/18/release-0.8.5.html

@@ -6,7 +6,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>

i2p2www/blog/2011/05/16/release-0.8.6.html

@@ -7,7 +7,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>

i2p2www/blog/2011/06/27/release-0.8.7.html

@@ -26,7 +26,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>

i2p2www/blog/2011/08/23/release-0.8.8.html

@@ -13,7 +13,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>

i2p2www/blog/2019/06/15/i2p-i2pd-ssh-config.rst

@@ -139,13 +139,12 @@ tunnels.conf
 
        [SSH-SERVER]
        type = server
+       host = 127.0.0.1
        port = 22
        inbound.length = 1
        outbound.length = 1
        inbound.quantity = 5
        outbound.quantity = 5
-       inbound.backupQuantity = 2
-       outbound.backupQuantity = 2
        i2cp.reduceOnIdle = true
        keys = ssh-in.dat
 
@@ -294,10 +293,8 @@ adjust it for your performance/anonymity needs.
        outbound.length = 1
        inbound.quantity = 5
        outbound.quantity = 5
-       inbound.backupQuantity = 2
-       outbound.backupQuantity = 2
        i2cp.dontPublishLeaseSet = true
-       destination = bubfjkl2l46pevgnh7yicm2e7rkld4jrgpmruw2ueqn5fa4ag6eq.b32.I2P
+       destination = thisshouldbethebase32ofthesshservertunnelabovebefore.b32.i2p
        keys = ssh-in.dat
 
 {% trans -%}Restart the I2P router on the client{%- endtrans %}

i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst

@@ -0,0 +1,91 @@
+======================================================
+{% trans -%}Hello Git, Goodbye Monotone{%- endtrans %}
+======================================================
+
+.. meta::
+   :author: idk
+   :date: 2020-12-10
+   :category: git
+   :excerpt: {% trans %}Hello git, goodbye mtn{% endtrans %}
+
+{% trans -%}
+Hello Git, Goodbye Monotone
+{%- endtrans %}
+===========================
+
+{% trans -%}
+The I2P Git Migration is nearly concluded
+{%- endtrans %}
+-----------------------------------------
+
+{% trans -%}
+For over a decade, I2P has relied on the venerable Monotone service to support
+its version control needs, but during the past few years, most of the world has
+moved on to the now-universal Git version control system. In that same
+time, the I2P Network has become faster and more reliable, and accessible
+workarounds to Git's non-resumability have been developed.
+{%- endtrans %}
+
+{% trans -%}
+Today marks a significant occasion for I2P, as we switched off the old mtn
+i2p.i2p branch, and moved the development of the core Java I2P libraries from
+Monotone to Git officially.
+{%- endtrans %}
+
+{% trans -%}
+While our use of mtn has been questioned in the past, and it's not always been a
+popular choice, I'd like to take this moment, as perhaps the very last project to use
+Monotone to thank the Monotone developers, current and former, wherever they are,
+for the software they created.
+{%- endtrans %}
+
+.. image:: /_static/images/GoodbyeMTN.png
+
+{% trans -%}
+GPG Signing
+{%- endtrans %}
+-----------
+
+{% trans -%}
+Checkins to the I2P Project repositories require you to configure GPG signing for
+your git commits, including Merge Requests and Pull Requests. Please configure
+your git client for GPG signing before you fork i2p.i2p and check anything in.
+{%- endtrans %}
+
+{% trans -%}
+Official Repositories and Gitlab/Github Syncing
+{%- endtrans %}
+-----------------------------------------------
+
+{% trans -%}
+The official repository is the one hosted at https://i2pgit.org/i2p-hackers/i2p.i2p
+and at https://git.idk.i2p/i2p-hackers/i2p.i2p, but there is a "Mirror" available
+at Github at https://github.com/i2p/i2p.i2p.
+{%- endtrans %}
+
+{% trans -%}
+Now that we're on git, we can synchronize repositories from our own self-hosted Gitlab
+instance, to Github, and back again. This means that it is possible to create and submit
+a merge request on Gitlab and when it is merged, the result will be synced with Github,
+and a Pull Request on Github, when merged, will appear on Gitlab.
+{%- endtrans %}
+
+{% trans -%}
+This means that it's possible to submit code to us through our Gitlab instance or through
+Github depending on what you prefer, however, more of the I2P developers are regularly
+monitoring Gitlab than Github. MR's to Gitlab are more likely to be merged sooner
+than PR's to Github.
+{%- endtrans %}
+
+{% trans -%}
+Thanks
+{%- endtrans %}
+------
+
+{% trans -%}
+Congratulations and thanks to everyone who helped in the git migration, especially
+zzz, eche|on, nextloop, and our site mirror operators! While some of us will miss
+Monotone, it has become a barrier for new and existing participants in I2P development
+and we're excited to join the world of developers using Git to manage their distributed
+projects.
+{%- endtrans %}

i2p2www/blog/2021/02/17/0.9.49-Release.rst

@@ -0,0 +1,108 @@
+===========================================
+{% trans -%}0.9.49 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2021-02-17
+   :category: release
+   :excerpt: {% trans %}0.9.49 with SSU fixes and faster crypto{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}
+0.9.49 continues the work to make I2P faster and more secure.
+We have several improvements and fixes for the SSU (UDP) transport that should result in faster speeds.
+This release also starts the migration to new, faster ECIES-X25519 encryption for routers.
+(Destinations have been using this encryption for a few releases now)
+We've been working on the specifications and protocols for new encryption for several years,
+and we are getting close to the end of it! The migration will take several releases to complete.
+{%- endtrans %}
+
+{% trans -%}
+For this release, to minimize disruption, only new installs and a very small percentage of existing installs
+(randomly selected at restart) will be using the new encryption.
+If your router does "rekey" to use the new encryption, it may have lower traffic or less reliability than usual for several days after you restart.
+This is normal, because your router has generated a new identity.
+Your performance should recover after a while.
+{%- endtrans %}
+
+{% trans -%}
+We have "rekeyed" the network twice before, when changing the default signature type,
+but this is the first time we've changed the default encryption type.
+Hopefully it will all go smoothly, but we're starting slowly to be sure.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}Build: Git migration{% endtrans %}
+- {% trans %}Build: Move web resources to wars{% endtrans %}
+- {% trans %}i2psnark WebSeed support{% endtrans %}
+- {% trans %}i2psnark padding file support{% endtrans %}
+- {% trans %}i2ptunnel: Move proxy resources to jar{% endtrans %}
+- {% trans %}Router: Redesign ECIES encryption for floodfills (proposal 156){% endtrans %}
+- {% trans %}Router: Verify RI stores after startup{% endtrans %}
+- {% trans %}Router: Reduce Sybil threshold{% endtrans %}
+- {% trans %}Router: ECIES for new routers{% endtrans %}
+- {% trans %}Router: Start of ECIES migration{% endtrans %}
+- {% trans %}SSU: Send individual fragments of messages{% endtrans %}
+- {% trans %}SSU: Westwood+ congestion control{% endtrans %}
+- {% trans %}SSU: Fast retransmit{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Build: Fix Gradle build{% endtrans %}
+- {% trans %}Crypto: Increase ratchet tag window to prevent message loss{% endtrans %}
+- {% trans %}I2CP: Fix encrypted leaseset combined with ECIES crypto or offline keys{% endtrans %}
+- {% trans %}i2ptunnel: Fix config file saving issues{% endtrans %}
+- {% trans %}Router: Fix leaseset request fails causing watchdog to bark{% endtrans %}
+- {% trans %}Router: Hidden mode fixes{% endtrans %}
+- {% trans %}SSU: Fix partial acks not being sent{% endtrans %}
+- {% trans %}SSU: Fix occasional high CPU usage{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}Crypto: AES performance improvements{% endtrans %}
+- {% trans %}DoH: Change to RFC 8484 style{% endtrans %}
+- {% trans %}i2ptunnel: Remove DSA shared clients{% endtrans %}
+- {% trans %}Proxy: Add jump servers{% endtrans %}
+- {% trans %}Router: Add more countries for hidden mode{% endtrans %}
+- {% trans %}Router: Tunnel peer selection changes{% endtrans %}
+- {% trans %}Router: Move Sybil subsystem from console to router for embedded use{% endtrans %}
+- {% trans %}Router: Verify RI stores for a while after startup{% endtrans %}
+- {% trans %}Util: New unit tests{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('trac.i2p2.i2p') }}/query?resolution=fixed&milestone=0.9.49
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+      af4f022f3532b46dd341717fd08447007ca5217b6c88664be693cac7f71912ea  i2pinstall_0.9.49_windows.exe
+      1614da8703b43e5bdc55007c784f2c211d00650ae0308273605d2ddc321b807e  i2pinstall_0.9.49.jar
+      5164ffb6eab228b4082d203c691906faa9ff32f09f41c3cebe6d941e03b0b9f2  i2psource_0.9.49.tar.bz2
+      af685caf28c842be6589471ebe32fc6bd85ad3fc609f1f5e0fbcae69b5d2575f  i2pupdate_0.9.49.zip
+      f41a6b47d2ea6e1b0d87427a57bd99a3d7f971d57de39b425dbf5017fae156dc  i2pupdate.su3
+
+
+

i2p2www/blog/2021/05/17/0.9.50-Release.rst

@@ -0,0 +1,104 @@
+===========================================
+{% trans -%}0.9.50 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2021-05-17
+   :category: release
+   :excerpt: {% trans %}0.9.50 with IPv6 fixes{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}
+0.9.50 continues the transition to ECIES-X25519 for router encryption keys.
+We have enabled DNS over HTTPS for reseeding to protect users from passive DNS snooping.
+There are numerous fixes and improvements for IPv6 addresses, including new UPnP support.
+{%- endtrans %}
+
+{% trans -%}
+We have finally fixed some longstanding SusiMail corruption bugs.
+Changes to the bandwidth limiter should improve network tunnel performance.
+There are several improvements in our Docker containers.
+We have improved our defenses for possible malicious and buggy routers in the network.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}Docker improvements{% endtrans %}
+- {% trans %}NTCP: Remove support for version 1{% endtrans %}
+- {% trans %}Reseed: Use DNSOverHTTPS{% endtrans %}
+- {% trans %}Router: Increase ECIES rekey probability{% endtrans %}
+- {% trans %}Router: Persist Sybil blocklist{% endtrans %}
+- {% trans %}SSU: Enable introducers and introductions via IPv6 (proposal 158){% endtrans %}
+- Tomcat 9.0.45
+- {% trans %}Transports: Publish support for outbound IPv4/v6 (proposal 158){% endtrans %}
+- {% trans %}UPnP: Add support for IPv6{% endtrans %}
+
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Debian: Fix link to compiler jar{% endtrans %}
+- {% trans %}i2psnark: Fix theme selection{% endtrans %}
+- {% trans %}Jetty: Fix detection of SSL connector{% endtrans %}
+- {% trans %}NetDB: Fix NPE when validating expired blinded leaseset{% endtrans %}
+- {% trans %}NTP: Year 2036 fixes{% endtrans %}
+- {% trans %}Router: Fix rekeying every restart on ARM{% endtrans %}
+- {% trans %}Router: Fix decryption of encrypted leasesets{% endtrans %}
+- {% trans %}SAM: Fix removal of subsessions{% endtrans %}
+- {% trans %}SSU: Fix excessive dropping by the bandwidth limiter{% endtrans %}
+- {% trans %}SSU: Fix publishing 'C' capability when not an introducer{% endtrans %}
+- {% trans %}SSU: Fixes for firewalled/not firewalled state transitions{% endtrans %}
+- {% trans %}SSU: IPv6 fixes{% endtrans %}
+- {% trans %}SSU: Peer test fixes{% endtrans %}
+- {% trans %}SusiMail: Fix theme selection{% endtrans %}
+- {% trans %}SusiMail: Fix stream closed errors{% endtrans %}
+- {% trans %}SusiMail: Fix corruption in display of large, new messages{% endtrans %}
+- {% trans %}Tunnels: Several fixes in the participating tunnel bandwidth limiter{% endtrans %}
+- {% trans %}UPnP: Fix leases not being renewed before expiration{% endtrans %}
+
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}Build: Remove empty jars and wars from installers{% endtrans %}
+- {% trans %}Build: Prep for different release and API versions{% endtrans %}
+- {% trans %}Build: Remove launcher code{% endtrans %}
+- {% trans %}Gradle build fixes{% endtrans %}
+- {% trans %}Profiles: Disable tunnel peer test{% endtrans %}
+- {% trans %}Profiles: Remove unused tunnel test response time stat{% endtrans %}
+- {% trans %}SSU: Avoid outbound connections to buggy routers{% endtrans %}
+- {% trans %}Transports: Increase connection limits for some platforms{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('trac.i2p2.i2p') }}/query?resolution=fixed&milestone=0.9.50
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+     92e38abf0650671e08460dd25711afa67f7933a0b6fa655cbd2746662f06fb30  i2pinstall_0.9.50_windows.exe
+     34902d2a7e678fda9261d489ab315661bd2915b9d0d81165acdee008d9031430  i2pinstall_0.9.50.jar
+     66d32b3fd29fb5d68c1cbfdcf2ee74a671ebb359cdc697260291f12e441d94ff  i2psource_0.9.50.tar.bz2
+     c32e9472e25b5d086198dba8e555604a12593ec92be987565b2fc5efa5ce3a7f  i2pupdate_0.9.50.zip
+     400e342a46a4ef76948e5118ce4005f7b03dd22424acb407f42d99f0bf581352  i2pupdate.su3
+
+

i2p2www/blog/2021/08/23/1.5.0-Release.rst

@@ -0,0 +1,74 @@
+===========================================
+{% trans -%}1.5.0 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2021-08-23
+   :category: release
+   :excerpt: {% trans %}1.5.0 with new tunnel build messages{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}
+Yes, that's right, after 9 years of 0.9.x releases, we are going straight from 0.9.50 to 1.5.0.
+This does not signify a major API change, or a claim that development is now complete.
+It is simply a recognition of almost 20 years of work to provide anonymity and security for our users.
+{%- endtrans %}
+
+{% trans -%}
+This release finishes implementation of smaller tunnel build messages to reduce bandwidth.
+We continue the transition of the network's routers to X25519 encryption.
+Of course there are also numerous bug fixes and performance improvements.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- RRD4J 3.8
+- {% trans %}Tunnels: Finish support for new build messages (proposal 157){% endtrans %}
+- {% trans %}Updates: Support for .dmg and .exe updates{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Console: Fix generation of SSL keys on Java 17{% endtrans %}
+- {% trans %}i2psnark: Fix autostart for magnets{% endtrans %}
+- {% trans %}Router: Fix rare deadlock in publishing our RI{% endtrans %}
+- {% trans %}SSU: Fix handling of bad peer test responses{% endtrans %}
+- {% trans %}UPnP: IPv6 fixes{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}Jetty: Improve sort in directory listings{% endtrans %}
+- {% trans %}Jetty: Add X-I2P-Location header{% endtrans %}
+- {% trans %}Router: Increase probability to rekey to ECIES{% endtrans %}
+- {% trans %}Streaming: Performance improvements for low-latency connections{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('trac.i2p2.i2p') }}/query?resolution=fixed&milestone=1.5.0
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+     2c9c382852e17e124d77a2bf28f95056599fd458f8de77adcf8e2aaa22b3ef81  i2pinstall_1.5.0_windows.exe
+     8c843c90870223b4808065761d059a02b168b74daddd1773c36f0a0245e201f9  i2pinstall_1.5.0.jar
+     26e5f4d95b1a0766870f97b30e57c9a8e98690279c3bf09198e30effabecc450  i2psource_1.5.0.tar.bz2
+     ea1b4b8095f4d6f5568ce879242e1d5b077de1beb4366f4a75a75cffd559ee7f  i2pupdate_1.5.0.zip
+     5d4812278350ce80f3a718f40698afc7f20f0808ef1e2ff56432ab0c2891134c  i2pupdate.su3

i2p2www/blog/2021/08/26/20-Years-of-I2P.rst

@@ -0,0 +1,104 @@
+===========================================
+{% trans -%}I2P Celebrates its 20th Year{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: idk
+   :date: 2021-08-26
+   :category: general
+   :excerpt: {% trans %}I2P has been around for 20 years, let's take a look back{% endtrans %}
+
+{% trans -%}
+20 Years of I2P
+{%- endtrans %}
+============================================
+
+{% trans -%}
+It's hard to believe, but I2P has been around for nearly 20 years! From its
+beginning as a C project which provided anonymous access to IRC, we've had
+hundreds of contributors, accepted checkins from dozens of coders, used 2
+main languages, 3 version control systems, experienced a migration of its
+crypography, and multiple soft-forks. There have been around 500 registered
+sites on the Invisible Web, and countless unregistered I2P sites that were only
+accessible via their cryptographic hostnames.
+{%- endtrans %}
+
+{% trans -%}
+Thanks to the participation of users like you, the network has grown from a tiny
+group of power users to over 75,000 nodes operated from all over the world,
+made of I2P routers bundled in perhaps dozens of applications. Today I2P is
+available in on Windows, Mac OSX, Linux, and has ports for FreeBSD, OpenBSD, and
+many other systems. I2P can run on phones and even in SOHO routers (thanks to the
+independent C++ implementation of the protocol, i2pd).
+{%- endtrans %}
+
+{% trans -%}
+A Routing Protocol with Flagship Applications
+{%- endtrans %}
+---------------------------------------------
+
+{% trans -%}
+Even before other anonymity projects were providing their own application
+bundles, I2P was a tool for building applications that were configured for
+anonymity. Over the years, we've leaned on this strength, by expanding our
+APIs to support more and more versatile applications. Today, we're still
+developing new ways of building I2P into applications.
+{%- endtrans %}
+
+{% trans -%}
+Using the power of the Hidden Services Manager or the SAM API, developers of all
+kinds of applications can empower their users with anonymity using I2P. Exciting
+downstream projects like Monero's I2P-Zero have made it very easy for developers
+to help their users get connected to I2P. Today, I2P helps provide anonymity to
+dozens of applications including Bitcoin, IRC, email and multiple file-sharing
+protocols.
+{%- endtrans %}
+
+{% trans -%}
+An Anonymous Network By Everyone, For Everyone
+{%- endtrans %}
+----------------------------------------------
+
+{% trans -%}
+I2P has always been a decentralized network, because its obvious that providing
+an anonymity network is an intrinsically collaborative process. To illustrate
+with the most extreme example, a single computer cannot provide itself
+with anonymity, nor can it be a useful network, by definiton. However, building
+I2P in this fully-decentralized manner hasn't always been easy.
+{%- endtrans %}
+
+{% trans -%}
+From the beginning, I2P would need to be scalable, and be able to balance itself
+so that  high-bandwidth nodes wouldn't be able to easily take over the network.
+Sybil attacks would leave the realm of academia and we would need to develop
+new defenses against them.
+{%- endtrans %}
+
+{% trans -%}
+We've worked very hard to never compromise on this stance, and today every I2P
+router helps participate in providing the network with bandwidth resources and
+providing the users with anonymity. In doing so, we've learned incredible things
+and produced a network which at times has seemed inconceivable.
+{%- endtrans %}
+
+{% trans -%}
+Celebrating I2P
+{%- endtrans %}
+---------------
+
+{% trans -%}
+Over the next 2 weeks, we've planned some blog posts where we'll explore the past,
+present, and future of I2P, highlight applications and tools that build on
+and enhance I2P, and showcase the best of our community. Check back here for
+more in the coming days!
+{%- endtrans %}
+
+* {% trans -%}`The History of I2P
+  </en/blog/post/2021/08/28/History-of-I2P>`_{%- endtrans %}
+* {% trans -%}`Dependency-Free I2P of the Future - Jpackage Bundles and I2P-Zero (from Monero)
+  </en/blog/post/2021/09/08/I2P-Jpackage-Bundles-and-Zero>`_{%- endtrans %}
+* {% trans -%}`Level-Up your I2P use with Encrypted LeaseSets
+  </en/blog/post/2021/09/07/Level-Up-Encrypted-Leasesets>`_{%- endtrans %}
+* {% trans -%}Dividing the Triangle: How I2P Eases Naming and Increases Flexibility for End-Users{%- endtrans %}
+* {% trans -%}I2P's Usability Journey{%- endtrans %}
+* {% trans -%}Building Bridges - Making Connections with Other Privacy Projects{%- endtrans %}

i2p2www/blog/2021/08/28/History-of-I2P.rst

@@ -0,0 +1,510 @@
+===========================================================
+{% trans -%}20 Years of Privacy: A Brief History of I2P{%- endtrans %}
+===========================================================
+
+.. meta::
+    :author: sadie
+    :date: 2021-08-28
+    :category: general
+    :excerpt: {% trans %}A history of I2P As We Know It{% endtrans %}
+
+{% trans -%}
+Invisibility is the best defense: building an internet within an internet
+{%- endtrans %}
+-------------------------------------------------------------------------
+
+    {% trans -%}I believe most people want this technology so they can express
+    themselves freely. It’s a comfortable feeling when you know you can
+    do that. At the same time we can conquer some of the problems seen
+    within the Internet by changing the way security and privacy is
+    viewed, as well as the extent to what it is valued.{%- endtrans %}
+
+
+{% trans -%}In October 2001, 0x90 ( Lance James) had a dream. It started as a
+“desire for instant communication with other Freenet users to talk about
+Freenet issues, and exchange Freenet keys while still maintaining
+anonymity, privacy and security.” It was called IIP — the Invisible IRC
+Project.{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/history/invisibleirc_banner.png
+    :width: 100%
+  .. image:: /_static/images/history/invisibleirc.png
+    :width: 100%
+
+{% trans -%}The Invisible IRC Project was based on an ideal and framework behind The
+InvisibleNet:{%- endtrans %}
+
+{% trans -%}In an interview from 2002, 0x90 described the project:{%- endtrans %}
+
+    {% trans -%}“InvisibleNet is a research & development driven organization whose main
+    focus is the innovation of intelligent network technology. Our goal is
+    to provide the highest standards in security and privacy on the widely
+    used, yet notoriously insecure Internet."{%- endtrans %}
+
+    {% trans -%}"The InvisibleNet team is comprised of a talented group of developers and
+    architects entirely dedicated to providing its users with both
+    convenience and the very best in secure communication."{%- endtrans %}
+
+    {% trans -%}"Our technological ideals are reflected in the implementation of a
+    framework that is solid in design, and transparent in its application."{%- endtrans %}
+
+    {% trans -%}"Here at InvisibleNet we strive towards the greatest level of quality
+    possible by keeping all areas of our research & development open and
+    available to the public for peer review, feedback, suggestions and new
+    ideas.”{%- endtrans %}
+
+    {% trans -%}"The Invisible Internet Project: Defined as the “New Internet”.
+    Peer 2 Peer Internet. Using your peers to protect you. It is a
+    similar concept to the Invisible IRC Project, with its design as our
+    test model. We plan to re-design the Internet by taking it a step
+    further and having security and privacy be first priority."{%- endtrans %}
+
+    {% trans -%}"The Invisible Internet Project or Protocol will be utilizing the
+    tests and research/development concepts of the Invisible IRC Project
+    to give us the scalability that we need and leverage this to take it
+    to the next level."{%- endtrans %}
+
+    {% trans -%}"This, in essence will be an impenetrable neural-network, that is
+    self-driven, self-defensed, and completely seamless to already
+    applied protocols, specifically client to server (or agents as I call
+    them). It will be THE next transport layer, a layer on top of the
+    notoriously insecure Internet, to deliver full anonymity, privacy,
+    and security at the highest level possible. Decentralized and peer to
+    peer Internet, by the way, means no more worrying about your ISP
+    controlling your traffic. This will allow you to do seamless
+    activities and change the way we look at security and even the
+    Internet, utilizing public key cryptography, IP steganography, and
+    message authentication. The Internet that should have been, will be
+    soon."{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/history/invisiblenet.png
+     :width: 100%
+
+| {% trans -%}All citations and quotes are from the interviews found here:{%- endtrans %}
+| http://invisibleip.sourceforge.net/iip/mediaDCInterview1.php
+| http://invisibleip.sourceforge.net/iip/mediaDCInterview2.php
+| http://invisibleip.sourceforge.net/index.php
+
+{% trans -%}By 2003, several other similar projects had started, the largest being
+Freenet, GNUNet, and Tor. All of these projects had broad goals to
+encrypt and anonymize a variety of traffic. For IIP, it became clear
+that IRC alone was not a big-enough target. What was needed was an
+anonymizing layer for all protocols. IIP by now was also being called
+“InvisibleNet”.{%- endtrans %}
+
+{% trans -%}In early 2003, a new anonymous developer, “jrandom” joined the project.
+His explicit goal was to broaden the charter of IIP.{%- endtrans %}
+
+{% trans -%}jrandom wished to rewrite the IIP code base in Java, a language he was
+familiar with, and the same language Freenet was using. He also wished
+to redesign the IIP protocols based on recent papers and the early
+design decisions that Tor and Freenet were making. Some of these
+concepts and naming conventions, such as “onion routing”, were modified
+to become “garlic routing”. For several of the design decisions, jrandom
+made different choices than Tor did, including selecting different
+cryptographic primitives in a number of places. Many (but not all) of
+these choices turned out quite well. For some others, such as using
+unidirectional tunnels rather than Tor’s bidirectional tunnels, the
+benefits and trade-offs are still not well-studied.{%- endtrans %}
+
+{% trans -%}jrandom also set out a clear vision for the architecture of the code. It
+would be a client/server model, with the server (i.e. the router)
+isolated from any “client” protocols. Clients such as web browsers, web
+servers, IRC clients and servers, and others, would communicate through
+the router using I2CP, the I2P Client Protocol.{%- endtrans %}
+
+{% trans -%}jrandom also had strong opinions on the direction of the project and its
+philosophy. He was strongly committed to open source and free software.
+He explicitly set a goal of protection from organizations with
+“unlimited financial and political resources.”{%- endtrans %}
+
+{% trans -%}By late summer 2003, jrandom had taken control of the project, and
+renamed it the Invisible Internet Project or “I2P”. He published a
+document outlining the philosophy of the project, and placed its
+technical goals and design in the context of mixnets and anonymizing
+layers. He also published the specification of two protocols (I2CP and
+I2NP) and their underlying data structures, that formed the basis of the
+network I2P uses today. Lance (“nop”) was last seen in a project meeting
+on November 11, 2003.{%- endtrans %}
+
+.. image:: /_static/images/history/bw1.png
+
+https://www.bloomberg.com/news/articles/2003-09-14/the-underground-internet
+
+.. image:: /_static/images/history/bw2.png
+
+{% trans -%}By fall 2003, I2P, Freenet, and Tor were rapidly developing. Business
+Week published an article on “The Underground Internet” which referenced
+InvisibleNet and discussed “darknets” extensively. jrandom released I2P
+version 0.2 on November 1, 2003, and continued rapid releases for the
+next 3 years. He maintained regular weekly meetings and status notes
+during this time. Several popular services and “respites” emerged during
+this time. Auto updates via clearnet HTTP became available in 2004.{%- endtrans %}
+
+{% trans -%}Through 2004 and 2005, router development continued, and several
+“clients” or applications were added to the I2P package. “Mihi” wrote
+the first streaming protocol implementation and the i2ptunnel interface
+for configuring and starting client tunnels. “Susi” wrote the web mail
+and address book applications SusiMail and SusiDNS. Many people worked
+on the router console web interface. A bridge to make it easier for
+non-I2P clients to communicate over I2P, called “SAM” (Simple Anonymous
+Messaging) was added.{%- endtrans %}
+
+| {% trans -%}In February 2005, zzz installed I2P for the first time.{%- endtrans %}
+| {% trans -%}Anonymity projects were in the news. After surveying the field, he
+  installed Freenet, and found it ambiguous, and difficult to explore.
+  Not only that, it was very resource heavy and it was difficult to get
+  anything to load. Tor and I2P were the other options, and he tried
+  I2P.{% endtrans %}
+
+{% trans -%}zzz had no preconceived plans to contribute to the project, and had
+never written a line of Java. He had maybe used IRC once. At this time,
+I2P was at version 0.5, with maybe a thousand users and three hard-coded
+floodfills. Forum.i2p and postman’s tracker were up and running at the
+time, and weekly meetings and status notes, and releases every couple of
+week were happening.{%- endtrans %}
+
+{% trans -%}By summer 2005, zzz had set up two websites. The first was zzz.i2p,
+which over the years became a central resource for I2P development, and
+still is. The second was stats.i2p, the first site to gather statistics
+on I2P network performance and present graphs on both the network and
+individual routers. While the individual router statistics eventually
+had to be shut down due to the tremendous growth of the network, the
+overall performance graphs remain. We are not sure that he ever planned
+to become the release manger for almost 2 decades, but we are happy he
+did. The project has not only stayed active, it has thrived and scaled
+to the demands of its growth.{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/history/statsi2p.png
+     :width: 100%
+
+{% trans -%}On July 27, 2005, jrandom released I2P version 0.6, including an
+innovative new UDP transport protocol he designed called “SSU”, for
+Secure Semi-reliable UDP. It contained features for IP discovery and
+firewall traversal.{%- endtrans %}
+
+{% trans -%}In September 2005, jrandom bundled “Syndie”, his new high-latency
+anonymous messaging system. In October 2005, jrandom ported Snark, a
+Java BitTorrent client, to become an I2P application and bundled it with
+the I2P package. This completed the collection of client applications
+that are still bundled with I2P today.{%- endtrans %}
+
+{% trans -%}In late 2005 and early 2006, jrandom redesigned the way that I2P built
+tunnels. This was a major effort that was done to increase the security
+of the tunnel building, which is crucial to maintain anonymity and
+resist attacks. He worked closely with the Freenet developers, including
+“Toad”, on this design. The new build protocol required new I2NP
+messages and a hard cut-over or “flag day”. These changes were released
+in version 0.6.1.10 on February 16, 2006. This is significant as it is
+the last flag day I2P has had. While, in practice, an 0.6.1.10 router
+would not work well, if at all, in today’s network, we are, technically
+speaking, backwards-compatible with this ten-year-old version today.{%- endtrans %}
+
+{% trans -%}By early 2006, the I2P software was at least feature-complete, but it
+was still not widely-known. jrandom’s view was that it shouldn’t be
+marketed publicly until it was near-perfect, and labeled as version 1.0.
+The network had perhaps a thousand users at the time. Project members
+were discouraged from talking about it online, and the website
+(`i2p.net <http://i2p.net>`__) was unpolished and incomplete.{%- endtrans %}
+
+{% trans -%}On July 27, 2006, jrandom released I2P version 0.6.1.23, including an
+innovative new TCP transport protocol he designed called “NTCP”, for
+new-IO-based TCP. It used Java’s new IO library for efficient handling
+of large numbers of TCP connections.{%- endtrans %}
+
+{% trans -%}In late 2006, jrandom turned his focus to Syndie. He came to see it as
+his top priority, and the “killer application” for I2P. Highly secure
+and almost unusable, it delayed messages for up to two days before
+delivery to resist traffic analysis. Later in 2006, he stopped work on
+the bundled Syndie application and started a new, incompatible,
+standalone messaging application. This application was, confusingly,
+also called “Syndie”. The new Syndie was a large and complex
+development, and it was essentially a one-man project.{%- endtrans %}
+
+{% trans -%}From late 2006 into 2007, core I2P development and releases slowed
+dramatically. From almost 30 releases in 2005 and 13 in the first half
+of 2006, there were only 5 in the second half of 2006 and only 4 in all
+of 2007. During this time, zzz and a developer named Complication had
+source code commit privileges and were making changes, but their
+understanding of the code base was limited. zzz worked, for example, on
+improving i2psnark, fixing bugs, and redesigning the strategy for
+anticipatory tunnel building. But there was a lot more that needed to be
+done. Complication and zzz did what they could, and they wrote the code
+for almost all the changes in the four 2007 releases
+(0.6.1.27–0.6.1.30). By this time, jrandom was providing very little
+guidance, code review, or direction for the project.{%- endtrans %}
+
+{% trans -%}It wasn’t apparent at the time, but the project was in trouble.{%- endtrans %}
+
+{% trans -%}jrandom had almost stopped working on the core I2P router and
+applications. Even the new Syndie, which he had declared as far more
+important than I2P itself, languished. After regular releases through
+March 2007, his next Syndie release, 1.100a, was August 25, 2007. All
+I2P releases were required to be signed by jrandom’s key, and he built
+and signed his last release, 0.6.1.30, on October 7, 2007.{%- endtrans %}
+
+{% trans -%}In November 2007, disaster struck. Complication and zzz received a
+cryptic message from jrandom, that he would have to take time off from
+both Syndie and I2P development for a year or more. He expected that he
+would still be available to sign releases, but was willing to pass the
+release signing key to somebody else. Complication and zzz immediately
+replied with a request for the release key and other credentials, such
+as access to the website, mailing list, CVS administration, and others.
+Unfortunately, they never heard from jrandom again.{%- endtrans %}
+
+{% trans -%}Late 2007 and early 2008, they awaited jrandom’s response, and wondered
+what to do next. However, all of the project infrastructure remained
+active, so it didn’t seem to be an immediate crisis. They knew, however,
+that without the release key or website access, they would have to sign
+with new keys, host the files on a new website, and require everybody to
+manually update since their keys wouldn’t be recognized.{%- endtrans %}
+
+{% trans -%}The second stage of the disaster happened on January 13, 2008. The
+hosting company for almost all `i2p.net <http://i2p.net>`__ servers
+suffered a power outage, and they did not fully return to service. Only
+jrandom had the credentials required to restore service. In addition,
+the centralized CVS source control appeared to be down, so five years of
+source control history appeared to be lost. Luckily, the CVS server was
+up, only the name server for it was down. The full contents of the CVS
+archive was quickly downloaded.{%- endtrans %}
+
+| {% trans -%}Complication, welterde, and zzz quickly made a number of decisions to
+  get the project back up and running. Welterde started a new website at
+  `i2p2.de <http://i2p2.de>`__. I2P needed to move to a decentralized
+  source code control system. They tested bazaar and that did not work
+  well over I2P. Git was just getting started. jrandom had used monotone
+  for Syndie and liked its security properties, and it worked well over
+  I2P, so it was selected.{%- endtrans %}
+| {% trans -%}Several people set up new services. The next release, 0.6.1.31, was
+  signed by Complication and required a manual upgrade. It was released
+  on February 10, 2008.{%- endtrans %}
+
+{% trans -%}The project realized that even though it claimed to be totally
+decentralized, it actually depended on a number of centralized
+resources, above all, on jrandom. Work was done throughout 2008 to
+decentralize the project, and distribute roles to a number of people.
+Additionally, it was realized that development had essentially stalled
+in 2007, because jrandom had stopped working on it, but had not
+delegated to other developers. Nobody had an overall understanding of
+the code base.{%- endtrans %}
+
+{% trans -%}Complication continued to sign the releases through mid-2009, but his
+contributions declined as he focused on activism and other projects.
+Starting with release 0.7.6 on July 31, 2009, zzz would sign the next 49
+releases.{%- endtrans %}
+
+{% trans -%}In December 2008, zzz attended his first CCC, 25C3 in Berlin, and met
+other I2P project team members for the first time, including hottuna and
+welterde. The experience was overwhelming, and also humbling, as he
+struggled to explain I2P to others or answer even basic questions about
+its design and use of cryptography.{%- endtrans %}
+
+{% trans -%}By mid-2009, zzz had come to understand the code base much better. Far
+from being complete or perfect, it was filled with problems and
+scalability issues. In 2009 the project experienced more network growth
+due to its anonymizing properties as well as its circumvention
+abilities. Participants appeared who were beginning to adopt the network
+for reasons like censorship and clearnet issues like blocking of popular
+services. For development gains, in-net auto updates became available
+for the software.{%- endtrans %}
+
+.. image:: /_static/images/history/propaganda.jpeg
+
+{% trans -%}July 2010 zzz briefly presented I2P at the end of Adrian Hong’s
+presentation at HOPE XXXX. Adrian talked about how tech has helped
+expose human rights violations, and the need for defensive tools for
+activists. He urged that we all be ambassadors for all tech, stay on top
+of new tech, and keep the barrier low and educate people about how to
+use the tool we create.{%- endtrans %}
+
+{% trans -%}He also talked about how we need many options for people to use, and
+asked how do we make it easier to support human rights, freedom of
+expression?{%- endtrans %}
+
+{% trans -%}At the end of the talk, zzz was invited on stage to introduce I2P and
+give an overview of what the project was about. The same weekend, it was
+pointed out that the I2P documentation was not in great shape.{%- endtrans %}
+
+{% trans -%}In Fall 2010, zzz declared a moratorium on I2P development until the
+website documentation was complete and accurate. It took 3 months to get
+it done.{%- endtrans %}
+
+{% trans -%}Beginning in 2010, until COVID restrictions were put in place, zzz, ech,
+hottuna, and other I2P contributors have attended CCC ( Chaos
+Communications Congress) every year. Over the years, meeh, Zab, Sadie,
+LazyGravy, KYTV, IDK and others have made the trip to Germany to share
+tables with other projects and celebrate the end of a year of releases.
+The project looks forward to one day being able to meet up again and
+have an in-person yearly roadmap meeting.{%- endtrans %}
+
+{% trans -%}Anoncoin, a digital cryptocurrency that focuses on privacy and anonymity
+for its users was created in 2013. It was the first coin that provided
+built-in support for I2P, as well as Tor that makes it impossible to
+determine the IP address of the user. The developers, including meeh,
+also ran organizations like Privacy Solutions, and provided infrastructure
+support to the I2P network by running services like outproxies and
+reseed servers.{%- endtrans %}
+
+{% trans -%}I2PBote development started to take off again in 2014 when str4d began
+contributing to the project. Bote is a server-less email client — it
+stores email in a `distributed hash
+table <http://en.wikipedia.org/wiki/Distributed_hash_table>`__. Email is
+“automatically encrypted and digitally signed, which ensures no one but
+the intended recipient can read the email, and third parties cannot
+forge them.” ( https://i2pbote.xyz/). The project has existed since
+2009.{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/history/bote.png
+     :width: 100%
+
+> I2PBote screenshot Credit: AceBarry
+
+{% trans -%}At Real World Crypto that year, zzz, psi and str4d began to talk about
+and review the plan to update I2P’s cryptography. The same year, the
+project was awarded a $5k donation from Duck Duck Go. Lavabit,
+SecureDrop, RiseUp and Mailpile also received donations for supporting
+better trust and privacy online.{%- endtrans %}
+
+{% trans -%}By late 2014 most new signing crypto was complete, including ECDSA and
+EdDSA. New destination crypto was available; but new router info crypto
+needed to wait a year for the network to upgrade sufficiently.{%- endtrans %}
+
+{% trans -%}During the early part of 2015, zzz posted to Twitter that it would be
+great to have a mini conference for I2P. In Spring, it was decided that
+I2PCon would take place that August over the course of a weekend.{%- endtrans %}
+
+{% trans -%}Hottuna and Sadie organized most of the details, getting graphic assets
+created, posters printed and a banner made for the podium. Nick at
+Hacklab, where the event would take place, helped with making sure the
+space was ready for the event. Sadie reached out to the local infosec
+community and helped secure guest speakers as well. The event happened
+on one of the hottest weekends of the Summer, with attendees arriving
+from America and Europe. The I2P community did an amazing job of
+supporting the event by postering, giving talks, and spreading the word
+in forums and on social media. The talks can be viewed on KYTV’s YouTube
+Channel https://www.youtube.com/channel/UCZfD2Dk6POE-VU8DOqW7VVw{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/history/i2pcon1.png
+     :width: 100%
+
+{% trans -%}In January 2016 at Real World Crypto Stanford — str4d gave a talk on the
+crypto migration progress and future plans for the project. zzz and
+others would continue weekly meetings to plan the migration over the
+next few years.{%- endtrans %}
+
+{% trans -%}NTCP2 was implemented in 2018, in release 0.9.36. It was disabled by
+default so that it could be tested. It was enabled in 0.9.37. NTCP1 was
+disabled in 0.9.40.{%- endtrans %}
+
+    {% trans -%}The new I2P transport protocol provides effective resistance against
+    DPI censorship. It also results in reduced CPU load because of the
+    faster, modern cryptography used. It makes I2P more likely to run on
+    low-end devices, such as smartphones and home routers. Both major I2P
+    implementations have full support for NTCP2 and it make NTCP2
+    available for use starting with version 0.9.36 (Java) and 2.20 (i2pd,
+    C++).{%- endtrans %}
+
+{% trans -%}The complete implementation details can be read here
+https://geti2p.net/en/blog/post/2018/08/20/NTCP2{%- endtrans %}
+
+{% trans -%}0.9.39 included extensive changes for new network database types
+(proposal 123). The i2pcontrol plugin was bundled as a web-app to support
+development of RPC applications.{%- endtrans %}
+
+{% trans -%}In 2019, the team decided to attend more conferences. That year IDK and
+zzz attended DefCon, and IDK gave a workshop on I2P application
+development. At Monero Village, zzz gave a talk called I2P for
+Cryptocurrency Developers.{%- endtrans %}
+
+{% trans -%}Late that year, Sadie and IDK attended Our Networks in Toronto, where
+IDK gave a lightning talk about I2P.{%- endtrans %}
+
+{% trans -%}Sadie attended RightsCon in Tunis and the Internet Freedom Festival in
+Valencia to meet with NGO’s and Human Right Defenders. Thanks to the the
+connections we made, the project received grants for usability and
+accessibility support from Open Tech Fund, and most recently Internews.
+This will ensure more user friendly onboarding, UX, and information
+architecture improvements to support the growing interest in the
+network. It will also support specific tooling to help in-need users
+with specific risk surfaces through user research.{%- endtrans %}
+
+.. image:: /_static/images/history/phong.png
+
+{% trans -%}That Summer, Hoàng Nguyên Phong had his research into I2P censorship
+accepted too FOCI at USENIX in Santa Clara. Sadie had supported the
+research and they attended together. I2P Metrics was created during this
+time https://i2p-metrics.np-tokumei.net/, and well as research into more
+resistant reseed servers for the I2P network
+https://homepage.np-tokumei.net/post/notes-i2p-reseed-over-cloudflare/.
+You can read the research report here
+https://homepage.np-tokumei.net/post/notes-otf-wrapup-blogpost/.{%- endtrans %}
+
+{% trans -%}At CCC that year, the decision was made to migrate from Monotone too
+GitLab. The project was one of the last to use Monotone, and it was time
+to prepare to move on. IDK would spend 2020 ensuring the process was as
+smooth as it could be. The pandemic would result in the team not being
+able to see each other that year to celebrate the ( mostly) smooth move
+to Gitlab. On December 10. 2020, the project switched off the old mtn
+i2p.i2p branch, and moved the development of the core Java I2P libraries
+from Monotone to Git officially.{%- endtrans %}
+
+    {% trans -%}Congratulations and thanks to everyone who helped in the git
+    migration, especially zzz, eche|on, nextloop, and our site mirror
+    operators! While some of us will miss Monotone, it has become a
+    barrier for new and existing participants in I2P development and
+    we’re excited to join the world of developers using Git to manage
+    their distributed projects.{%- endtrans %}
+
+https://geti2p.net/en/blog/post/2020/12/10/Hello-git-goodbye-mtn
+
+{% trans -%}0.9.47 enabled the new end-to-end encryption protocol (proposal 144) by
+default for some services. A Sybil analysis and blocking tool was also
+now enabled by default. 0.9.48 enabled the new end-to-end encryption
+protocol (proposal 144) for most services. Preliminary support was added
+for new tunnel build message encryption (proposal 152). There were
+significant performance improvements throughout the router.{%- endtrans %}
+
+{% trans -%}0.9.49 was the release that brought faster crypto. The I2P network
+became faster and more secure. Improvements and fixes for the SSU (UDP)
+transport resulted in faster speeds. The release also started the
+migration to new, faster ECIES-X25519 encryption for routers. The
+project had been working on the specifications and protocols for new
+encryption for several years, and was getting close to the end of it.
+The migration would take several releases to complete.{%- endtrans %}
+
+{% trans -%}To minimize disruption, only new installs and a very small percentage of
+existing installs (randomly selected at restart) would be using the new
+encryption.{%- endtrans %}
+
+{% trans -%}The project had “rekeyed” the network twice before, when changing the
+default signature type, but this was the first time it had changed the
+default encryption type. 0.9.50 enabled DNS over HTTPS for reseeding to
+protect users from passive DNS snooping. There were numerous fixes and
+improvements for IPv6 addresses, including new UPnP support.{%- endtrans %}
+
+.. _31b4:
+
+{% trans -%}1.5.0 — The early anniversary release because it is so good!{%- endtrans %}
+------------------------------------------------------------
+
+    {% trans -%}Yes, that’s right, after 9 years of 0.9.x releases, we are going
+    straight from 0.9.50 to 1.5.0. This does not signify a major API
+    change, or a claim that development is now complete. It is simply a
+    recognition of almost 20 years of work to provide anonymity and
+    security for our users.{%- endtrans %}
+
+    {% trans -%}This release finishes implementation of smaller tunnel build messages
+    to reduce bandwidth. We continue the transition of the network’s
+    routers to X25519 encryption. Of course there are also numerous bug
+    fixes and performance improvements.{%- endtrans %}
+
+    {% trans -%}As usual, we recommend that you update to this release. The best way
+    to maintain security and help the network is to run the latest
+    release.{%- endtrans %}
+
+{% trans -%}Congratulations team. Let’s do another 20.{%- endtrans %}

i2p2www/blog/2021/09/07/Level-Up-Encrypted-Leasesets.rst

@@ -0,0 +1,193 @@
+=============================================================
+{% trans -%}Level up your I2P Skills with Encrypted LeaseSets{%- endtrans %}
+=============================================================
+
+.. meta::
+   :author: idk
+   :date: 2021-09-07
+   :category: general
+   :excerpt: {% trans %}It has been said that I2P emphasizes Hidden Services, we examine one interpretation of this{% endtrans %}
+
+{% trans -%}
+Level up your I2P Skills with Encrypted LeaseSets
+{%- endtrans %}
+=================================================
+
+{% trans -%}
+It has been said in the past that I2P emphasizes support for Hidden Services,
+which is true in many ways. However, what this means to users, developers, and
+hidden service administrators isn't always the same. Encrypted LeaseSets and
+their use-cases provide a unique, practical window into how I2P makes hidden
+services more versatile, easier to administer, and how I2P extends on the
+Hidden Service concept to provide security benefits for potentially interesting
+use-cases.
+{%- endtrans %}
+
+{% trans -%}
+What is a LeaseSet?
+-------------------
+{%- endtrans %}
+
+{% trans -%}
+When you create a hidden service, you publish something called a "LeaseSet" to
+the I2P NetDB. The "LeaseSet" is, in the simplest terms, what other I2P users
+need to discover "where" your hidden service is on the I2P Network. It contains
+"Leases" which identify tunnels that can be used to reach your hidden service,
+and the public key of your destination, which clients will encrypt messages to.
+This type of hidden service is reachable by anyone who has the address, which
+is probably the most common use case for now.
+{%- endtrans %}
+
+{% trans -%}
+Sometimes, you might not want to allow your hidden services to be accessible by
+anyone, though. Some people use hidden services as a way of accessing an SSH
+server on a home PC, or to stitch together a network of IOT Devices. In these
+cases it's not necessary, and may be counter-productive, to make your hidden
+service accessible to everyone one the I2P Network. This is where "Encrypted
+LeaseSets" come into play.
+{%- endtrans %}
+
+{% trans -%}
+Encrypted LeaseSets: VERY Hidden Services
+------------------------------------------
+{%- endtrans %}
+
+{% trans -%}
+Encrypted LeaseSets are LeaseSets which are published to the NetDB in an
+encrypted form, where none of the Leases or public keys are visible unless
+the client has the keys required to decrypt the LeaseSet inside of it. Only
+clients you share keys with(For PSK Encrypted LeaseSets), or who share their
+keys with you(For DH Encrypted LeaseSets), will be able to see the destination
+and no one else.
+{%- endtrans %}
+
+{% trans -%}
+I2P Supports several strategies for Encrypted LeaseSets. The key characteristics
+of each strategy are important to understand when deciding which one to use. If
+an Encrypted LeaseSet uses a "Pre-Shared Key(PSK)" strategy, then the server
+will generate a key(or keys) which the server operator then shares with each
+client. Of course, this exchange must happen out-of-band, possibly via an
+exchange on IRC for example. This version of Encrypted LeaseSets is sort of
+like logging into Wi-Fi with a password. Except, what you're logging into is
+a Hidden Service.
+{%- endtrans %}
+
+{% trans -%}
+If an Encrypted LeaseSet uses a "Diffie-Hellman(DH)
+strategy, then they keys are generated on the client instead. When a
+Diffie-Hellman client connects to a destination with an Encrypted LeaseSet, they
+must first share their keys with the server operator. The server operator then
+decides whether to authorize the DH client. This version of Encrypted LeaseSets
+is sort of like SSH with an `authorized_keys` file. Except, what you're logging
+into is a Hidden Service.
+{%- endtrans %}
+
+{% trans -%}
+By Encrypting your LeaseSet, you not only make it impossible for unauthorized
+users to connect to your destination, you make it impossible for unauthorized
+visitors to even discover the real destination of the I2P Hidden Service. Some
+readers have probably already considered a use-case for their own Encrypted
+LeaseSet.
+{%- endtrans %}
+
+{% trans -%}
+Using Encrypted LeaseSets to Safely Access a Router Console
+-----------------------------------------------------------
+{%- endtrans %}
+
+{% trans -%}
+As a general rule, the more complex information a service has access to about
+your device, the more dangerous it is to expose that service to the Internet or
+indeed, to a Hidden Service network like I2P. If you want to expose such a
+service, you need to protect it with something like a password, or, in the case
+of I2P, a much more thorough and secure option could be an Encrypted LeaseSet.
+{%- endtrans %}
+
+{% trans -%}
+**Before continuing, please read and understand that if you do the following**
+**procedure without an Encrypted LeaseSet, you will be defeating the security of**
+**your I2P router. Do not configure access to your router console over I2P without**
+**an Encrypted LeaseSet. Additionally, do not share your Encrypted LeaseSet PSK's**
+**with any devices you do not control.**
+{%- endtrans %}
+
+{% trans -%}
+One such service which is useful to share over I2P, but ONLY with an Encrypted
+LeaseSet, is the I2P router console itself. Exposing the I2P router console on
+one machine to I2P with an Encrypted LeaseSet allows another machine with a
+browser to administer the remote I2P instance. I find this useful for remotely
+monitoring my regular I2P Services. It could also be used to monitor a server
+which is used to seed a torrent long-term as a way to access I2PSnark.
+{%- endtrans %}
+
+{% trans -%}
+For as long as it takes to explain them, setting up an Encrypted LeaseSet is
+straightforward to configure via the Hidden Services Manager UI. 
+{%- endtrans %}
+
+{% trans -%}
+On the "Server"
+---------------
+{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/encryptls/newhs.png
+     :width: 100%
+
+{% trans -%}
+Start by opening the Hidden Services Manager at http://127.0.0.1:7657/i2ptunnelmgr
+and scroll to the bottom of the section that says "I2P Hidden Services." Create
+a new hidden service with the host "127.0.0.1" and the port "7657" with these
+"Tunnel Cryptography Options" and save the hidden service. 
+{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/encryptls/demosettings.png
+     :width: 100%
+
+{% trans -%}
+Then, select your new tunnel from the Hidden Services Manager main page. The
+Tunnel Cryptography Options should now include your first Pre-Shared Key. Copy
+this down for the next step, along with the Encrypted Base32 Address of your
+tunnel.
+{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/encryptls/demoresult.png
+     :width: 100%
+
+{% trans -%}
+On the "Client"
+---------------
+{%- endtrans %}
+
+{% trans -%}
+Now switch computers to the client which will connect to the hidden service,
+and visit the Keyring Configuration at http://127.0.0.1:7657/configkeyring to
+add the keys from earlier. Start by pasting the Base32 from the Server into
+the field labeled: "Full destination, name, Base32, or hash." Next, paste the
+Pre-Shared Key from the server into the "Encryption Key" field. Click save,
+and you're ready to securely visit the Hidden Service using an Encrypted
+LeaseSet.
+{%- endtrans %}
+
+.. compound::
+  .. image:: /_static/images/encryptls/client.png
+     :width: 100%
+
+{% trans -%}
+Now You're Ready to Remotely Administer I2P
+-------------------------------------------
+{%- endtrans %}
+
+{% trans -%}
+As you can see, I2P offers unique capabilities to Hidden Service Administrators
+which empower them to securely manage their I2P connections from anywhere in the
+world. Other Encrypted LeaseSets I keep on the same device for the same reason
+point to the SSH server, the Portainer instance I user to manage my service
+containers, and my personal NextCloud instance. With I2P, truly private, always
+reachable Self-Hosting is an achievable goal, in fact I think it's one of the
+things we're uniquely suited to, because of Encrypted LeaseSets. With them, I2P
+could become the key to securing self-hosted home automation or simply become
+the backbone of a new more private peer-to-peer web.
+{%- endtrans %}

i2p2www/blog/2021/09/15/i2p-jpackages.rst

@@ -0,0 +1,102 @@
+==========================================================================
+{% trans -%}Improving I2P Adoption and Onboarding using Jpackage, I2P-Zero{%- endtrans %}
+==========================================================================
+
+.. meta::
+   :author: idk
+   :date: 2021-09-15
+   :category: general
+   :excerpt: {% trans %}Versatile and emerging ways of installing and embedding I2P in your application{% endtrans %}
+
+{% trans -%}
+For the majority of I2P's existence, it's been an application that runs with the
+help of a Java Virtual Machine that is already installed on the platform. This
+has always been the normal way to distribute Java applications, but it leads to
+a complicated installation procedure for many people. To make things even more
+complicated, the "right answer" to making I2P easy to install on any given
+platform might not be the same as any other platform. For example, I2P is quite
+simple to install with standard tools on Debian and Ubuntu based operating
+systems, because we can simply list the required Java components as "Required"
+by our package, however on Windows or OSX, there is no such system allowing us to make
+sure that a compatible Java is installed.
+{%- endtrans %}
+
+{% trans -%}
+The obvious solution would be to manage the Java installation ourselves, but
+this used to a problem in-and-of-itself, outside of the scope of I2P. However,
+in recent Java versions, a new set of options has emerged which has the
+potential to solve this problem for many Java software. This exciting tool is
+called **"Jpackage."**
+{%- endtrans %}
+
+{% trans -%}
+I2P-Zero and Dependency-Free I2P Installation
+{%- endtrans %}
+---------------------------------------------
+
+{% trans -%}
+The first very successful effort at building a dependency-free I2P Package was
+I2P-Zero, which was created by the Monero project originally for use with the
+Monero cryptocurrency. This project got us very excited because of it's success
+in creating a general-purpose I2P router which could easily packaged with an
+I2P application. Especially on Reddit, many people express their preference for
+the simplicity of setting up an I2P-Zero router.
+{%- endtrans %}
+
+{% trans -%}
+This really proved to us that a dependency-free I2P Package which was easy to
+install was possible using modern Java tools, but I2P-Zero's use case was a
+little bit different than ours. It is best for embedded apps that need an I2P
+router that they can easily control using it's convenient control port on port
+"8051". Our next step would be to adapt the technology to the general-purpose
+I2P Application.
+{%- endtrans %}
+
+{% trans -%}
+OSX Application Security Changes affect I2P IzPack Installer
+{%- endtrans %}
+------------------------------------------------------------
+
+{% trans -%}
+The issue became more pressing in recent versions of Mac OSX, where it is no
+longer straightforward to use the "Classic" installer which comes in the .jar
+format. This is because the application is not "Notarized" by Apple authorities
+and it is deemed a security risk. **However**, Jpackage can produce a .dmg file,
+which can be notarized by Apple authorities, conveniently solving our problem.
+{%- endtrans %}
+
+{% trans -%}
+The new I2P .dmg installer, created by Zlatinb, makes I2P easier to install on
+OSX than ever, no longer requiring users to install Java themselves and using
+standard OSX installation tools in their prescribed ways. The new .dmg installer
+makes setting up I2P on Mac OSX easier than it's ever been.
+{%- endtrans %}
+
+Get the dmg_.
+
+.. _dmg: /mac
+
+{% trans -%}
+The I2P of the future is Easy to Install
+{%- endtrans %}
+----------------------------------------
+
+{% trans -%}
+One of the things I hear from users the most is that if I2P wants adoption, it
+needs to be easy to use for people. Many of them want a "Tor Browser Like" user
+experience, to quote or paraphrase many familiar Redditors. Installation should
+not require complicated and error-prone "post-installation" steps. Many new
+users are not prepared to deal with their browser configuration in a thorough
+and complete way. To address this problem, we created the I2P Profile Bundle
+which configured Firefox so that it would automatically "Just Work" for I2P.
+As it's developed, it's added security features and improved integration with
+I2P itself. In it's latest version, it **also** bundles a complete, Jpackage
+powered I2P Router. The I2P Firefox Profile is now a fully-fledged distribution
+of I2P for Windows, with the only remaining dependency being Firefox itself.
+This should provide an unprecedented level of convenience for I2P users on
+Windows.
+{%- endtrans %}
+
+Get the installer_.
+
+.. _installer: /nsis

i2p2www/blog/2021/09/18/i2p-bitcoin.rst

@@ -0,0 +1,108 @@
+=============================================================
+{% trans -%}Bitcoin Core adds support for I2P!{%- endtrans %}
+=============================================================
+
+.. meta::
+   :author: idk
+   :date: 2021-09-18
+   :category: general
+   :excerpt: {% trans %}A new use case and a signal of growing acceptance{% endtrans %}
+
+{% trans -%}
+An event months in the making, Bitcoin Core has added official support for I2P!
+Bitcoin-over-I2P nodes can interact fully with the rest of the Bitcoin nodes,
+using the help of nodes that operate within both I2P and the clearnet, making
+them first-class participants in the Bitcoin network. It's exciting to see
+large communities like Bitcoin taking notice of the advantages I2P can bring
+to them providing privacy and reachability to people all over the world.
+{%- endtrans %}
+
+{% trans -%}
+How it Works
+{%- endtrans %}
+------------
+
+{% trans -%}
+I2P support is automatic, via the SAM API. This is also exciting news, because
+it highlights some of the things I2P is singularly good at, like empowering 
+application developers to build I2P connections programmatically and
+conveniently. Bitcoin-over-I2P users can use I2P with no manual configuration by
+enabling the SAM API and running Bitcoin with I2P enabled.
+{%- endtrans %}
+
+{% trans -%}
+Configuring your I2P Router
+{%- endtrans %}
+---------------------------
+
+{% trans -%}
+In order to set up an I2P Router to provide anonymous connectivity to bitcoin,
+the SAM API needs to be enabled. In Java I2P, you should go to `http://127.0.0.1:7657/configclients
+<http://127.0.0.1:7657/configclients>`_. and start the SAM Application Bridge
+with the "Start" button. You may also want to enable the SAM Application Bridge
+by default by checking the "Run at Startup" box and clicking "Save Client
+Configuration."
+{%- endtrans %}
+
+{% trans -%}
+On i2pd, the SAM API is normally enabled by default, but if it isn't, you should
+set::
+
+  sam.enabled=true
+
+in your i2pd.conf file.
+{%- endtrans %}
+
+{% trans -%}
+Configuring your Bitcoin Node for Anonymity and Connectivity
+{%- endtrans %}
+------------------------------------------------------------
+
+{% trans -%}
+Getting Bitcoin itself launched in an anonymous mode still requires editing some
+configuration files in the Bitcoin Data Directory, which is %APPDATA%\Bitcoin on
+Windows, ~/.bitcoin on Linux, and ~/Library/Application Support/Bitcoin/ on Mac
+OSX. It also requires at least version 22.0.0 for I2P support to be present. 
+{%- endtrans %}
+
+{% trans -%}
+After following these instructions, you should have a private Bitcoin
+node which uses I2P for I2P connections, and Tor for .onion and clearnet
+connections, so that all your connections are anonymous. For convenience,
+Windows users should open their Bitcoin Data Directory by opening the start menu
+and searching for "Run." Inside the run prompt, type "%APPDATA%\Bitcoin" and
+press enter.
+{%- endtrans %}
+
+{% trans -%}
+In that directory create a file called "i2p.conf." On Windows, you should make
+sure that you've add quotes around the file when you save it, in order to
+prevent Windows from adding a default file extension to the file. The file
+should contain the following I2P-Related Bitcoin configuration options::
+
+  i2psam=127.0.0.1:7656
+  i2pacceptincoming=true
+  onlynet=i2p
+
+Next, you should create another file called "tor.conf." The file should contain
+the following Tor related configuration options::
+
+  proxy=127.0.0.1:9050
+  onion=127.0.0.1:9050
+  onlynet=tor
+
+Finally, you'll need to "include" these configuration options in your Bitcoin
+configuration file, called "bitcoin.conf" in the Data Directory. Add these two
+lines to your bitcoin.conf file::
+
+  includeconf=i2p.conf
+  includeconf=tor.conf
+
+Now your Bitcoin node is configured to only use anonymous connections. In order
+to enable direct connections to remote nodes, remove the lines beginning in::
+
+  onlynet=
+
+You can do this if you do not require your Bitcoin node to be anonymous, and
+it helps anonymous users connect to the rest of the Bitcoin network.
+{%- endtrans %}

i2p2www/blog/2021/11/2/i2p-jpackage-1.5.1.rst

@@ -0,0 +1,61 @@
+=============================================================
+{% trans -%}I2P Jpackages get their First Update{%- endtrans %}
+=============================================================
+
+.. meta::
+   :author: idk
+   :date: 2021-11-02
+   :category: general
+   :excerpt: {% trans %}New, easier-to-install packages reach a new milestone{% endtrans %}
+
+{% trans -%}
+A few months ago we released new packages which we hoped would help with onboarding new
+people to the I2P network by making the installation and configuration of I2P easier for
+more people. We removed dozens of steps from the installation process by switching from
+an external JVM to a Jpackage, built standard packages for target operating systems, and
+signed them in a way the operating system would recognize to keep the user secure. Since
+then, the jpackage routers have reached a new milestone, they are about to recieve their
+first incremental updates. These updates will replace the JDK 16 jpackage with an updated
+JDK 17 jpackage and provide fixes for some small bugs which we caught after the release.
+{%- endtrans %}
+
+{% trans -%}
+Updates common to Mac OS and Windows
+{%- endtrans %}
+------------------------------------
+
+{% trans -%}
+All jpackaged I2P installers recieve the following updates:
+
+* Update the jpackaged I2P router to 1.5.1 which is built with JDK 17
+
+Please update as soon as possible.
+{%- endtrans %}
+
+{% trans -%}
+I2P Windows Jpackage Updates
+{%- endtrans %}
+----------------------------
+
+{% trans -%}
+Windows only packages recieve the following updates:
+
+* Updates I2P in Private Browsing, NoScript browser extensions
+* Begins to phase out HTTPS everywhere on new Firefox releases
+* Updates launcher script to `fix post NSIS launch issue on some architectures <https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/9>`_
+
+For a full list of changes see the `changelog.txt in i2p.firefox <https://i2pgit.org/i2p-hackers/i2p.firefox/>`_
+{%- endtrans %}
+
+{% trans -%}
+I2P Mac OS Jpackage Updates
+{%- endtrans %}
+---------------------------
+
+{% trans -%}
+Mac OS only packages recieve the following updates:
+
+* No Mac-Specific changes. Mac OS is updated to build with JDK 17.
+
+For a summary of development see the `checkins in i2p-jpackage-mac <https://i2pgit.org/i2p-hackers/i2p-jpackage-mac>`_
+{%- endtrans %}

i2p2www/blog/2021/11/29/1.6.0-Release.rst

@@ -0,0 +1,83 @@
+===========================================
+{% trans -%}1.6.1 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2021-11-29
+   :category: release
+   :excerpt: {% trans %}1.6.1 enables new tunnel build messages{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}
+Note: 1.6.1 is the current release. 1.6.0 was tagged but not released.
+{%- endtrans %}
+
+{% trans -%}
+This release completes the rollout of two major protocol updates developed in 2021.
+The transition to X25519 encryption for routers is accelerated, and we expect almost all routers to be rekeyed by the end of the year.
+Short tunnel build messages are enabled for a significant bandwidth reduction.
+{%- endtrans %}
+
+{% trans -%}
+We added a theme selection panel to the new install wizard.
+We've improved SSU performance and fixed an issue with SSU peer test messages.
+The tunnel build Bloom filter was adjusted to reduce memory usage.
+We have enhanced support for non-Java plugins.
+{%- endtrans %}
+
+{% trans -%}
+In other news, we are making excellent progress on the design of our new UDP transport SSU2 and expect to start implementation early next year.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}Console: Add theme selection to new-install wizard{% endtrans %}
+- Jetty 9.3.30.v20211001
+- {% trans %}Router: Increase probability of rekey to X25519{% endtrans %}
+- {% trans %}SSU: Performance improvements{% endtrans %}
+- {% trans %}SSU: Improve security of peer test{% endtrans %}
+- Tomcat 9.0.54
+- {% trans %}Tunnels: Enable sending new short build messages{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}i2ptunnel: Fix encryption type selection logic{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}Improve support for non-Java plugins{% endtrans %}
+- {% trans %}Router: Reduce tunnel build Bloom filter memory usage{% endtrans %}
+- {% trans %}Updates: More changes to support bundled updaters{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('git.idk.i2p') }}/i2p-hackers/i2p.i2p/-/issues?scope=all&state=closed&milestone_title=1.6.0
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+      c5d5757d0cc1f4ce0cf2a663c35ca173d0cfe4ef0f38ac50b1be116787b03c87  i2pinstall_1.6.1_windows.exe
+      2ae90f28d51b84796079430bde53589e1c2117125d5fb7bb5c036c4e1ad1eb80  i2pinstall_1.6.1.jar
+      719606c4cb510de4fe74f24bbfa53911a70531821fc1ee79a29e3d96eaa16733  i2psource_1.6.1.tar.bz2
+      90ac2eb6a0207a7614568129e4f8927b9e3765a533033600b9a1f5a53779134d  i2pupdate_1.6.1.zip
+      5fe7982cc1499872864a022507d0850627448d62ef65e0a7b5c172144a04368d  i2pupdate.su3

i2p2www/blog/2021/12/11/i2p-unaffected-cve-2021-44228.rst

@@ -0,0 +1,35 @@
+==============================================
+{% trans -%}I2P is not affected by the log4j vulnerability{%- endtrans %}
+==============================================
+
+.. meta::
+   :author: idk, zzz
+   :date: 2021-12-11
+   :category: security
+   :excerpt: {% trans %}I2P doesn't use log4j and is therefore unaffected by CVE-2021-44228{% endtrans %}
+
+{% trans -%}
+I2P is not affected by the log4j 0-Day vulnerability which was published
+yesterday, CVE-2021-44228. I2P doesn't use log4j for logging, however we also
+needed to review our dependencies for log4j usage, especially jetty. This
+review has not revealed any vulnerabilities.
+{%- endtrans %}
+
+{% trans -%}
+It was also important to check all of our plugins. Plugins may bring in their
+own logging systems, including log4j. We found that most plugins also do not use
+log4j, and those that do did not use a vulnerable version of log4j.
+{%- endtrans %}
+
+{% trans -%}
+We haven't found any dependency, plugin or app that's vulnerable.
+{%- endtrans %}
+
+{% trans -%}
+We bundle a log4j.properties file with jetty for plugins that introduce log4j. This
+file only has an effect on plugins which use log4j logging internally. We have
+checked in the recommended mitigation to the log4j.properties file. Plugins which
+enable log4j will run with the vulnerable feature disabled. As we cannot find any
+usage of log4j 2.x anywhere, we have no plans to do an emergency release at this 
+time.
+{%- endtrans %}

i2p2www/blog/2022/1/1/I2P-2021-in-Review.rst

@@ -0,0 +1,173 @@
+===============================================
+{% trans -%}Year in Review: 2021{%- endtrans %}
+===============================================
+
+.. meta::
+   :author: Sadie
+   :date: 2021-12-29
+   :category: general
+   :excerpt: {% trans %}I2P Turns 20, Faster Crypto and A Growing Network{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}Development Highlights{%- endtrans %}
+#################################################
+
+{% trans -%}
+The 0.9.49 release began the migration to the new, faster ECIES-X25519
+encryption for routers. It took many years of work on the specifications and
+protocols for new encryption, and this release, new installs and a very small
+percentage of existing installs (randomly selected at restart) began using the
+new encryption. This is the first time that the default encryption type has
+ever been changed, so the full migration would take place over several
+releases in order to minimize any issues.
+{%- endtrans %}
+
+{% trans -%}Full release notes{%- endtrans %}: https://geti2p.net/en/blog/post/2021/02/17/0.9.49-Release
+
+{% trans -%}
+0.9.50 enabled DNS over HTTPS for reseeding to protect users from passive DNS
+snooping. Additionally, work was done to protect the network from possible
+malicious and buggy routers, and numerous fixes and improvements for IPv6
+addresses, including new UPnP support were completed.
+{%- endtrans %}
+
+{% trans -%}Full release notes{%- endtrans %}: https://geti2p.net/en/blog/post/2021/05/17/0.9.50-Release
+
+{% trans -%}
+In recognition of almost 20 years of work to provide anonymity and security,
+the team decided to go straight from 0.9.50 to 1.5.0. The 1.5.0 release
+finished support for new build messages (proposal 157), and finished
+implementation of smaller tunnel build messages to reduce bandwidth. The
+transition of the network’s routers to X25519 encryption continued.
+{%- endtrans %}
+
+
+{% trans -%}Full release notes{%- endtrans %}: https://geti2p.net/en/blog/post/2021/08/23/1.5.0-Release
+
+{% trans -%}
+The rollout of two major protocol updates reached completed in 1.6.1. Almost
+all routers will be rekeyed by the end of the year. Also, short tunnel build
+messages were enabled for a significant bandwidth reduction. Progress on the
+design of the new UDP transport SSU2 began, and is expected to start
+implementation early next year.
+{%- endtrans %}
+
+
+{% trans -%}Full release notes{%- endtrans %}: https://geti2p.net/en/blog/post/2021/11/29/1.6.0-Release
+
+{% trans -%}Easier Installs: JPackage{%- endtrans %}
+****************************************************
+
+{% trans -%}
+With upwards of 30 steps required to install both the I2P software and Java,
+the process for new user onboarding has not been historically easy. Unfamiliar
+and unintuitive, it was a process that has created issues for usability for
+many years.
+{%- endtrans %}
+
+{% trans -%}
+However, in recent Java versions, a new option emerged that had the potential
+to solve this issue for the Java software. The tool is called “Jpackage” and
+would allow for the creation of a Jpackage powered I2P Router.
+{%- endtrans %}
+
+{% trans -%}
+We removed dozens of steps from the installation process by switching from an
+external JVM to a Jpackage, built standard packages for target operating systems,
+and signed them in a way the operating system would recognize to keep the user
+secure. Since then, the jpackage routers have reached a new milestone, they have
+recieved their first incremental updates. These updates will replace the JDK 16
+jpackage with an updated JDK 17 jpackage and provide fixes for some small bugs
+which we caught after the release.
+{%- endtrans %}
+
+{% trans -%}Improving I2P Adoption and Onboarding using Jpackage, I2P-Zero{%- endtrans %}: https://geti2p.net/en/blog/post/2021/09/15/i2p-jpackages
+{% trans -%}JPackages Get their First Update{%- endtrans %}: https://geti2p.net/en/blog/post/2021/11/2/i2p-jpackage-1.5.1
+
+{% trans -%}Bitcoin Core added Support for I2P{%- endtrans %}
+*************************************************************
+
+{% trans -%}
+Bitcoin-over-I2P nodes can now fully interact with the rest of the Bitcoin nodes,
+using the help of nodes that operate within both I2P and the clearnet.
+{%- endtrans %}
+
+{% trans -%}Read the full blog post{%- endtrans %}: https://geti2p.net/en/blog/post/2021/09/18/i2p-bitcoin
+
+{% trans -%}I2P Usability Lab{%- endtrans %}
+********************************************
+
+{% trans -%}
+This year, the I2P Usability Lab was created. The focus will be on user research,
+product development and tooling to support adoption. Additionally, better focus on
+localization efforts, protocol bridge building within the privacy community and
+sustainability considerations will be part of the ongoing effort to bring I2P to
+more people.
+{%- endtrans %}
+
+{% trans -%}New User Onboarding Research{%- endtrans %}
+*******************************************************
+
+{% trans -%}
+In 2020 the I2P UX team worked with Simply Secure on a usability sprint to assess
+user interaction with the I2P website. Many changes were applied, however, feedback
+has indicated that there are still issues with some aspects of new user onboarding.
+{%- endtrans %}
+
+{% trans -%}
+We have expanded our team thanks to the BASICS project (Building Analytical and
+Support Infrastructure for Critical Security tools), and not only revisiting the
+new user onboarding, but we are also expanding the scope to include onboarding for
+developers and researchers. The goal will be to present an improved information
+architecture.
+{%- endtrans %}
+
+{% trans -%}
+This year we focused on the massive overhaul of the new user onboarding for the
+download and browser configuration workflow and language. New wireframes for the
+I2P website have been created, and new information architecture put in place. This
+has been done in order to better support new users, maintainers, application 
+developers, I2P core contributors, and researchers. This work will continue into
+2022 as documentation is refined and the site changes are implemented.
+{%- endtrans %}
+
+{% trans -%}Read the full UX review here:{%- endtrans %} https://i2p.medium.com/i2p-ux-research-d2567aefd275
+
+{% trans -%}Forum on internet Freedom in Africa 2021{%- endtrans %}
+*******************************************************************
+
+{% trans -%}
+Working with our partners in Africa, the Invisible Internet Project was invited
+to participate in both a panel discussion, as well as work with a group of 
+journalists to explore what privacy and security mean to them. The goal for the
+outcome from this opportunity was to understand what establishes trust, the
+concept of privacy and what it means, and egin to evaluate I2P and its tooling
+through this lens.
+{%- endtrans %}
+
+{% trans -%}
+We saw that adoption results from efficiency, ease of use, and empowerment. All
+of these things result in a person not just wanting to use a privacy option, but to
+feel like they are actually taking control of their privacy. This is one of the
+most important aspects we have encountered during the past year when talking with
+new users: the emotional aspect of interacting with technology. Telling a person
+that something can technically provide a solution is one part of adoption. Providing
+a person with something that they can use with confidence is the other. 
+Meeting people where they are and asking about who they are ensures that we are
+creating for real needs and for the most people possible.
+{%- endtrans %}
+
+{% trans -%}Read the entire blog post here{%- endtrans %}: https://i2p.medium.com/i2p-usability-lab-b2098bf27d4d
+
+{% trans -%}
+Thank you to everyone who contributes to building the Invisible Internet!
+{%- endtrans %}
+
+{% trans -%}
+This post originally appeared on Sadie's blog. https://i2p.medium.com/4b926a488919
+Copied with permission.
+{%- endtrans %}

i2p2www/blog/2022/2/21/1.7.0-Release.rst

@@ -0,0 +1,111 @@
+===========================================
+{% trans -%}1.7.0 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2022-02-21
+   :category: release
+   :excerpt: {% trans %}1.7.0 with reliability and performance improvements{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+
+{% trans -%}
+The 1.7.0 release contains several performance and reliability improvements.
+{%- endtrans %}
+
+{% trans -%}
+There are now popup messages in the system tray, for those platforms that support it.
+i2psnark has a new torrent editor.
+The NTCP2 transport now uses much less CPU.
+{%- endtrans %}
+
+{% trans -%}
+The long-deprecated BOB interface is removed for new installs.
+It will continue to work in existing installs, except for Debian packages.
+Any remaining users of BOB applications should ask the developers to convert to the SAMv3 protocol.
+{%- endtrans %}
+
+{% trans -%}
+We know that since our 1.6.1 release, network reliability has steadily deteriorated.
+We were aware of the problem soon after the release, but it took us almost two months to find the cause.
+We eventually identified it as a bug in i2pd 2.40.0,
+and the fix will be in their 2.41.0 release coming out about the same time as this release.
+Along the way, we've made several changes on the Java I2P side to improve the
+robustness of network database lookups and stores, and avoid poorly-performing peers in tunnel peer selection.
+This should help the network be more robust even in the presence of buggy or malicious routers.
+Additionally, we're starting a joint program to test pre-release i2pd and Java I2P routers
+together in an isolated test network, so we can find more problems before the releases, not after.
+{%- endtrans %}
+
+{% trans -%}
+In other news, we continue to make great progress on the design of our new UDP transport "SSU2" (proposal 159)
+and have started implementation.
+SSU2 will bring substantial performance and security improvements.
+It will also allow us to finally replace our last usage of the very slow ElGamal encryption,
+completing a full cryptography upgrade that started about 9 years ago.
+We expect to start joint testing with i2pd soon, and roll it out to the network later this year.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}BOB: Remove{% endtrans %}
+- {% trans %}i2psnark: New torrent editor{% endtrans %}
+- {% trans %}i2psnark standalone: Fixes and improvements{% endtrans %}
+- {% trans %}i2ptunnel: Support IRCv3 message tags{% endtrans %}
+- {% trans %}NetDB: Lookup/store reliability improvements{% endtrans %}
+- {% trans %}System tray: Add popup messages{% endtrans %}
+- {% trans %}Transport: NTCP2 performance improvements{% endtrans %}
+- {% trans %}Transport: NTCP2 clock skew handling improvements{% endtrans %}
+- {% trans %}Transport: Use priority in SSU sender queue{% endtrans %}
+- {% trans %}Tunnels: Remove outbound tunnel when can't connect to first hop{% endtrans %}
+- {% trans %}Tunnels: Fallback to exploratory for building after repeated build failure{% endtrans %}
+- {% trans %}Tunnels: Enable tunnel testing by default{% endtrans %}
+- {% trans %}Tunnels: Use tunnel builds as a tunnel test{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Plugins: Fixes for webapps named different from the plugin{% endtrans %}
+- {% trans %}Reseed: Fixes for IPv6-only{% endtrans %}
+- {% trans %}Router: Fix rare deadlock at startup{% endtrans %}
+- {% trans %}Tunnels: Restore IP restriction tests{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}API version{% endtrans %}: 0.9.53
+- {% trans %}i2pcontrol: Improved state mapping{% endtrans %}
+- {% trans %}i2ptunnel: Refactor UDP support{% endtrans %}
+- {% trans %}Plugins: Fixes for webapps{% endtrans %}
+- {% trans %}Router: Workarounds for i2pd 2.40.0 SSU bug{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('git.idk.i2p') }}/i2p-hackers/i2p.i2p/-/issues?scope=all&state=closed&milestone_title=1.7.0
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+      a2206e2578e88aa08294b68df2c9dad4f9301a94dc3d00bfccfe4517555e226c  i2pinstall_1.7.0_windows.exe
+      23b80dd09bf4bb53edfde8e802bf0e428d89062f1232b3cdfeca04fccdbeb685  i2pinstall_1.7.0.jar
+      aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e  i2psource_1.7.0.tar.bz2
+      fcfd2e3685de8c0b79b2018638821c64411c66c61ab84d2bf74c149358c96dba  i2pupdate_1.7.0.zip
+      d8110d77efb9712d69b622df03b7c9cd7f492b516b71914efb6019d31541e771  i2pupdate.su3

i2p2www/blog/2022/4/21/Easy-Install-Updates.rst

@@ -0,0 +1,31 @@
+===========================================
+{% trans -%}Jpackage Update for Java CVE-2022-21449{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: idk
+   :date: 2022-04-21
+   :category: release
+   :excerpt: {% trans %}Jpackage bundles released with fixes for Java CVE-2022-21449{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+{% trans -%}
+New I2P Easy-Install bundles have been generated using the latest release of the
+Java Virtual Machine which contains a fix for CVE-2022-21449
+"Psychic Signatures." It is recommended that users of the easy-install bundles
+update as soon as possible. Current OSX users will recieve updates automatically,
+Windows users should download the installer from our downloads page and run the
+installer normally.
+{%- endtrans %}
+
+{% trans -%}
+The I2P router on Linux uses the Java Virtual Machine configured by the host
+system. Users on those platforms should downgrade to a stable Java version below
+Java 14 in order to mitigate the vulnerability until updates are released by
+the package maintainers. Other users using an external JVM should update the JVM
+to a fixed version as soon as possible.
+{%- endtrans %}

i2p2www/blog/2022/5/23/1.8.0-Release.rst

@@ -0,0 +1,95 @@
+===========================================
+{% trans -%}1.8.0 Release{%- endtrans %}
+===========================================
+
+.. meta::
+   :author: zzz
+   :date: 2022-05-23
+   :category: release
+   :excerpt: {% trans %}1.8.0 with bug fixes{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+============================================
+
+
+{% trans -%}
+This release includes bug fixes in i2psnark,
+the router, I2CP, and UPnP.
+Router fixes address bugs in soft restart, IPv6, SSU peer testing,
+network database stores, and tunnel building.
+Router family handling and Sybil classification have also been
+significantly improved.
+{%- endtrans %}
+
+{% trans -%}
+Together with i2pd, we are developing our new UDP transport, SSU2.
+SSU2 will bring substantial performance and security improvements.
+It will also allow us to finally replace our last usage of the very slow ElGamal encryption,
+completing the full cryptography upgrade we started about 9 years ago.
+This release contains a preliminary implementation which is disabled by default.
+If you wish to participate in testing, please look for current information
+on zzz.i2p.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}SSU2: Preliminary implementation{% endtrans %}
+- Tomcat 9.0.62
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Crypto: Fix handling of EdDSA certs with official OID{% endtrans %}
+- {% trans %}I2CP: Fix external connections when session ID is 0{% endtrans %}
+- {% trans %}I2PSnark: Fix size calculation causing tracker errors{% endtrans %}
+- {% trans %}I2PSnark standalone: More fixes and improvements{% endtrans %}
+- {% trans %}Router: Family fixes and improvements{% endtrans %}
+- {% trans %}Router: Fix database store logic{% endtrans %}
+- {% trans %}Router: Fix invalid store and rekeying at startup{% endtrans %}
+- {% trans %}Router: Don't use he.net addresses for GeoIP{% endtrans %}
+- {% trans %}Router: Soft restart fixes{% endtrans %}
+- {% trans %}SSU: Peer test fixes{% endtrans %}
+- {% trans %}SSU: Publish empty IPv6 address when missing introducers{% endtrans %}
+- {% trans %}SSU: Reduce ack delay to improve performance{% endtrans %}
+- {% trans %}Transport: Fix UPnP deadlock{% endtrans %}
+- {% trans %}Tunnels: Don't build client tunnels shorter than minimum length{% endtrans %}
+- {% trans %}UPnP: IPv6 fixes{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}API version{% endtrans %}: 0.9.54
+- {% trans %}Console: Setup wizard redesign{% endtrans %}
+- {% trans %}i2psnark: Load system mime types if available{% endtrans %}
+- {% trans %}I2PSnark standalone: Add system tray{% endtrans %}
+- {% trans %}Router: Reduce build reply timeout so we will retry faster{% endtrans %}
+- {% trans %}Router: Avoid Sybil penalty for trusted large families{% endtrans %}
+- {% trans %}Source: Remove BOB{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('git.idk.i2p') }}/i2p-hackers/i2p.i2p/-/issues?scope=all&state=closed&milestone_title=1.8.0
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+      738b7608d7f2c6433dcde8a1cbd7ea025d281e90b45c8695385004625a4c88d1  i2pinstall_1.8.0_windows.exe
+      ee49cad06fd73e75ed25eaab342f8167e447b901205ee8593a31b5a599d892af  i2pinstall_1.8.0.jar
+      525f2ad3267f130b81296b3dd24102fdcf2adf098d54272da4e1be4abd87df04  i2psource_1.8.0.tar.bz2
+      446ac94969163bce514aca6bb408cb72d1b8d9bd65fe22e773ec3bcad142db21  i2pupdate_1.8.0.zip
+      3379fe757eecbf20688ee37685fe52f15ac04fd59e891c6a059a33d519c4ff19  i2pupdate.su3

i2p2www/blog/README

@@ -41,7 +41,7 @@ Writing draft posts
 To write a draft post, create the file with the suffix '.draft.rst'. Post files
 with this suffix will be visible at their post URL, but will not be shown in
 the blog index. To publish the draft post, change the filename to remove the
-'.draft' in the suffix (e.g. mtn mv foo.draft.rst foo.rst).
+'.draft' in the suffix (e.g. git mv foo.draft.rst foo.rst).
 
 Creating shortlinks
 -------------------

i2p2www/downloads.py

@@ -8,18 +8,38 @@ from random import randint
 from i2p2www import CURRENT_I2P_VERSION, MIRRORS_FILE
 
 DEFAULT_MIRROR = {
-    'net': 'clearnet',
-    'protocol': 'https',
-    'domain':   'download.i2p2.de',
-    'org':      'sigterm.no',
-    'country':  'no',
+    "net": "clearnet", 
+    "protocol": "https", 
+    "domain": "files.i2p-projekt.de", 
+    "path": "/%(version)s/%(file)s", 
+    "org": "i2p-projekt", 
+    "org_url": "https://files.i2p-projekt.de", 
+    "country": "de",
 }
 
+#DEFAULT_MIRROR = {
+#    "net": "clearnet",
+#    "protocol": "https",
+#    "domain": "download.i2p2.de",
+#    "path": "/releases/%(version)s/%(file)s",
+#    "org": "sigterm.no",
+#    "org_url": "https://download.i2p2.de", 
+#    "country": "no",
+#}
+
+#{
+ #   'net': 'clearnet',
+ #   'protocol': 'https',
+ #   'domain':   'download.i2p2.de',
+ #   'org':      'sigterm.no',
+ #   'country':  'no',
+#}
+
 DEFAULT_I2P_MIRROR = {
     'net': 'i2p',
     'protocol': 'http',
-    'domain':   'whnxvjwjhzsske5yevyokhskllvtisv5ueokw6yvh6t7zqrpra2q.b32.i2p',
-    'org':      'sigterm.no',
+    'domain':   'mgp6yzdxeoqds3wucnbhfrdgpjjyqbiqjdwcfezpul3or7bzm4ga.b32.i2p',
+    'org':      'eyedeekay.github.io',
     'country':  'i2p',
 }
 
@@ -70,6 +90,19 @@ def downloads_debian():
 def downloads_windows():
     return render_template('downloads/windows.html')
 
+# AIO-Windows-specific page
+def downloads_easyinstall():
+    # TODO: read mirror list or list of available files
+    if request.headers.get('X-I2P-Desthash') and not request.headers.get('X-Forwarded-Server'):
+        def_mirror = DEFAULT_I2P_MIRROR
+    else:
+        def_mirror = DEFAULT_MIRROR
+    return render_template('downloads/easyinstall.html', def_mirror=def_mirror)
+
+# Docker-specific page
+def downloads_docker():
+    return render_template('downloads/docker.html')
+
 # Firefox-specific page
 def downloads_firefox():
     # TODO: read mirror list or list of available files
@@ -81,7 +114,21 @@ def downloads_firefox():
 
 # The Lab
 def downloads_lab():
-    return render_template('downloads/lab.html')
+    # TODO: read mirror list or list of available files
+    if request.headers.get('X-I2P-Desthash') and not request.headers.get('X-Forwarded-Server'):
+        def_mirror = DEFAULT_I2P_MIRROR
+    else:
+        def_mirror = DEFAULT_MIRROR
+    return render_template('downloads/lab.html', def_mirror=def_mirror)
+
+# Mac DMG page
+def downloads_mac():
+    # TODO: read mirror list or list of available files
+    if request.headers.get('X-I2P-Desthash') and not request.headers.get('X-Forwarded-Server'):
+        def_mirror = DEFAULT_I2P_MIRROR
+    else:
+        def_mirror = DEFAULT_MIRROR
+    return render_template('downloads/mac.html', def_mirror=def_mirror)
 
 def downloads_config():
     return render_template('downloads/config.html')

i2p2www/legacy.py

@@ -19,6 +19,10 @@ LEGACY_FUNCTIONS_MAP={
     'debian':        {'function': 'downloads_debian', 'params': {}},
     'firefox':        {'function': 'downloads_firefox', 'params': {}},
     'lab':           {'function': 'downloads_lab',    'params': {}},
+    'mac':           {'function': 'downloads_mac',    'params': {}},
+    'easyinstall':           {'function': 'downloads_easyinstall',    'params': {}},
+    'nsis':           {'function': 'downloads_easyinstall',    'params': {}},
+    'windows':           {'function': 'downloads_windows',    'params': {}},
     'download':      {'function': 'downloads_list',   'params': {}},
     'installation':  {'function': 'downloads_list',   'params': {}},
     'meetings':      {'function': 'meetings_index',   'params': {}},

i2p2www/meetings/helpers.py

@@ -54,6 +54,7 @@ def get_meetings_ids(num=0):
         # iterate over all files
         for f in v[2]:
             # ignore all non-.rst files
+            print("Meeting file found", f)
             if not f.endswith('.rst'):
                 continue
             try:

i2p2www/meetings/logs/297.log

@@ -0,0 +1,158 @@
+(08:01:02 PM) eyedeekay: Hi everyone and welcome to the March 2 Meeting, please let me know if you're here
+(08:01:27 PM) eyedeekay: zzz zlatinb eche|on eche|off
+(08:01:42 PM) eyedeekay: Agenda
+(08:01:42 PM) eyedeekay: 1) Hi 
+(08:01:42 PM) eyedeekay: 2) 0.9.49 remaining items 
+(08:01:42 PM) eyedeekay: 3) Mac Launcher Status 
+(08:01:42 PM) eyedeekay: 5) 0.9.50 release 
+(08:01:42 PM) eyedeekay: 6) Trac migration summary
+(08:01:46 PM) Irc2PGuest1578 [kilian@xvbemdlawzj2qlt3cgjgaclevziobxvwmipcvecbla4xqkmwjd2q.b32.i2p] entered the room.
+(08:01:46 PM) zzz: hi
+(08:01:55 PM) zlatinb: hi
+(08:01:55 PM) eyedeekay: 4) 1.0.0 vs 0.9.50
+(08:03:04 PM) eyedeekay: hi zzz, hi zlatinb, timeout 30s anyone else?
+(08:03:39 PM) eyedeekay: Thanks everyone, starting right in with 2) 0.9.49 remaining items
+(08:03:51 PM) eyedeekay: The only one I know of is the .dmg version of the Mac installer
+(08:04:20 PM) zzz: the others are official debian and ubuntu
+(08:04:45 PM) zzz: I'll explain a little more
+(08:04:50 PM) eyedeekay: Ok thanks.
+(08:05:06 PM) zzz: unfortunately, debian bullseye just hit a freeze
+(08:05:29 PM) zzz: our debian maintainer either wasn't aware of the schedule or didn't advise us to hurry
+(08:05:51 PM) zzz: so while we did pull in the schedule to for ubuntu hirsute 21.04, the debian deadline was earlier
+(08:06:09 PM) zzz: since ubuntu pulls from debian, ubuntu didn't get it either
+(08:06:45 PM) zzz: this is a once every two year thing, but still, would have been nice to know
+(08:06:54 PM) zzz: as it was, we hurried up about ubuntu, all for nothing
+(08:07:25 PM) zzz: so, at some point, debian will unfreeze, and 49 should show up in sid. but bullseye is 48
+(08:07:27 PM) zzz: eot
+(08:07:59 PM) eyedeekay: Thanks zzz. So for the time being the recommendation for Debian users to get an up-to-date router should be via our repository
+(08:08:17 PM) zzz: yup. ditto ubuntu.
+(08:08:32 PM) zzz: oh, if I may, a brief report on the network:
+(08:08:41 PM) eyedeekay: Sure go ahead
+(08:08:48 PM) zzz: 52% updated to 49; 6% rekeyed to ECIES. All looks good so far
+(08:09:03 PM) zzz: very few bugs found or reported
+(08:09:05 PM) zzz: eot
+(08:09:21 PM) eyedeekay: Excellent to hear, thanks for the report
+(08:09:49 PM) eyedeekay: And I guess I can work on figuring out what mailing list we need to be subscribed to to get word earlier on when Debian will freeze
+(08:10:02 PM) eyedeekay: 3) Mac Launcher Status
+(08:10:14 PM) eyedeekay: This is the DMG based installer, not the .jar
+(08:10:54 PM) eyedeekay: I dropped the ball on this one, by failing to notify people that the previous maintainer was no longer building the installer
+(08:11:15 PM) eyedeekay: As a result I removed the Mac installer from the site
+(08:11:39 PM) zzz: iirc the last one built was .45 a year ago, and it probably was a broken link for most of last year
+(08:11:41 PM) eyedeekay: I have since aquired a Mac with the intent to take up maintenance of the product
+(08:12:00 PM) eyedeekay: zzz you are correct
+(08:12:04 PM) zlatinb: there is a problem with the dmg installer - at least on my mac I can't get the router to stop.  Some daemon keeps restarting it
+(08:12:09 PM) zzz: so it was actually a longstanding issue. you were correct to remove it, thanks for that
+(08:13:16 PM) zlatinb: so if other mac users are in the same situation we should come up with some sort of guide for cleaning up
+(08:13:28 PM) zzz: have you figured out if there's some auto-update or notification built in? and if so is that broken also? or is it just the news entry in the console?
+(08:13:57 PM) zlatinb: auto-update does work, strangely enough
+(08:13:57 PM) eyedeekay: It can't auto-update, at least not successfully
+(08:14:04 PM) eyedeekay: Oh well that's weird
+(08:14:09 PM) zlatinb: I just can't kill it and make sure it stays dead
+(08:14:28 PM) eyedeekay: Well sounds like some of the behavior is pretty erratic
+(08:14:56 PM) zzz: eyedeekay, last we discussed it, there was some debate as to the value of this installer product to our users, compared to the effort required to maintain it
+(08:15:15 PM) zzz: how do we nvestigate and evaluate those two factors?
+(08:15:58 PM) zzz: and zlatinb do you have any thoughts on the value of a "mac way" installer today?
+(08:16:36 PM) zlatinb: I still think a Mac way and Win way installers are far superior than the izpack monstrocity
+(08:16:37 PM) eyedeekay: I think zlatinb and I will need to compare notes, I'm seeing different behavior than he is and if I don't know why continuing to build and support it becomes much more intimidating
+(08:17:16 PM) zlatinb: but I think we need to re-evaluate the complexity in light of jpackage coming out with Java 14+
+(08:18:02 PM) zlatinb: either way, a  Mac-way installer would/should be lower priority than Win-way installer
+(08:18:05 PM) zzz: I'm not a mac person, but "far superior" was the consensus at the time we started development of the installer
+(08:18:43 PM) zzz: if the consensus is different now, I'd like to understand why
+(08:19:24 PM) zlatinb: to my knowledge it's still the same consensus, just the ecosystem has changed (i.e. jpackage exists)
+(08:20:26 PM) eyedeekay: IIRC my experience with Mac at the time was basically nil and my favor for the idea was based on the idea that working with familiar packaging systems makes our packages easier to trust
+(08:20:39 PM) eyedeekay: jpackage does the runtime image/eliminate the need to install Java thing right? the dmg to my knowledge didn't do that?
+(08:20:51 PM) zzz: right
+(08:21:18 PM) zlatinb: right
+(08:21:30 PM) zlatinb: jpackage builds dmgs supposedly, I haven't tried it
+(08:21:38 PM) zzz: so jpackage would be some 100MB thing. since it's only for one OS, it's feasible to do it for mac. 
+(08:21:47 PM) zzz: yeah dmgs would have to be tested for sure
+(08:22:14 PM) zlatinb: it builds windows installers too, I haven't used that functionality though
+(08:22:26 PM) zlatinb: and rpms and debs but I'm pretty sure we don't want those
+(08:22:52 PM) zzz: one of our failings as a project is that the dmg was always labeled 'experimental' on our d/l page. We never paid it enough attention to remove the label or even notice that nobody was building it
+(08:22:57 PM) Irc2PGuest1578 left the room (quit: Read error).
+(08:24:06 PM) zzz: as with all our other official products, if we're going to support it we need enough resources for a competent maintainer
+(08:25:15 PM) zzz: at this point I propose that we continue the evaluation of both user demand and effort required, both for existing dmg and jpackage.
+(08:25:29 PM) zzz: interim report in one month, final decision in two months, in time for .50
+(08:25:52 PM) zlatinb: any thoughts how to go about that?  survey? 
+(08:26:32 PM) eyedeekay: I could set up a Reddit survey after the meeting
+(08:26:42 PM) zzz: forum posts
+(08:27:11 PM) eyedeekay: Works for me, I'll add it to next month's meeting agenda
+(08:28:06 PM) eyedeekay: Anything else on 3)?
+(08:28:32 PM) eyedeekay: 4) 1.0.0 vs 0.9.50
+(08:29:02 PM) zzz: this was my item
+(08:29:10 PM) eyedeekay: Take it away zzz
+(08:29:28 PM) zzz: I don't feel strongly either way, but I think we should go to 1.0.0 in the next year or so
+(08:29:49 PM) zzz: as we don't have a separate stable branch, 1.0.0 is not a particular guarantee of stability
+(08:30:23 PM) Irc2PGuest1578 [kilian@xvbemdlawzj2qlt3cgjgaclevziobxvwmipcvecbla4xqkmwjd2q.b32.i2p] entered the room.
+(08:30:27 PM) zzz: so my question is what people think, and can the PR team accomplish messaging on what 1.0.0 is or isn't, on some timeline?
+(08:30:29 PM) zzz: eot
+(08:31:14 PM) zlatinb: so I have two points regarding 1.0.0:
+(08:31:41 PM) zlatinb: 1) RED needs tuning and I will die on that hill if I must.  Tunning it properly may require more than one release
+(08:32:19 PM) zlatinb: 2) Back to the installers issue - if we can build much smoother installers for the major platforms, a 1.0.0. release will have much greater impact
+(08:32:20 PM) zlatinb: eot
+(08:33:40 PM) eyedeekay: I think we can devise and accomplish messaging and PR for 1.0.0, if 1.0.0 coincides with migration of cryptography away from Elgamal, and I agree with zab on 2)
+(08:34:30 PM) zzz: we can always pick some headline feature to brag about, any release. It's fairly arbitrary. We could pick any release this year and claim it's when we're ditching elgamal. It's happening already
+(08:35:44 PM) zzz: as I'm not hearing any strong consensus, I propose that the next release is 0.9.50, and we discuss it again after that release, in 3 months
+(08:35:51 PM) eyedeekay: Then 2) remains pretty important to me, installers are a pain point as strange as that seems
+(08:36:15 PM) eyedeekay: I agree that the next one should be 0.9.50
+(08:36:27 PM) anonymousmaybe left the room (quit: Read error).
+(08:36:31 PM) T3s|4 left the room (quit: Read error).
+(08:37:36 PM) eyedeekay: Anything else on 4)?
+(08:38:16 PM) T3s|4 [~T3s4@573a4z46ixhpfeuej2hggtzg2wvsllq6nurtha5dzpd7l42awaeq.b32.i2p] entered the room.
+(08:38:16 PM) mode (+v T3s|4) by ChanServ
+(08:38:18 PM) eyedeekay: 5) 0.9.50 release
+(08:38:42 PM) anonymousmaybe [anonymousm@zvezcslfl5ndd6ciniqp2ei3cm6kvcovceeu3nzheqe7rqcj3rra.b32.i2p] entered the room.
+(08:38:42 PM) mode (+v anonymousmaybe) by ChanServ
+(08:39:19 PM) zzz: I'll let you go first, then I'll list what I've been up to
+(08:41:28 PM) eyedeekay: It's been about 2 weeks since the 0.9.49 release, in that time I've been working on style bugs, moving the configuration of X-I2P-Location into the application instead of requiring a reverse proxy or specific configuration, and have been working on finding ways to improve gitlab
+(08:42:17 PM) eyedeekay: In particular a way to migrate trac tickets to gitlab en-masse and a way to create tickets anonymously are on my gitlab list
+(08:43:06 PM) eyedeekay: Those are actually largely accomplished and part of the next agenda item, so I won't waste time on that now
+(08:43:56 PM) eyedeekay: EOT
+(08:44:06 PM) zzz: super
+(08:44:26 PM) zzz: I fixed NTP for the year 2036 issue
+(08:44:33 PM) zzz: implemented UPnP for IPv6
+(08:44:45 PM) zzz: reduced memory usage by the profiles
+(08:44:55 PM) zzz: added support for IPv6 introducers
+(08:45:17 PM) zzz: added "4/6" caps support for better tracking of who can connect to who
+(08:45:39 PM) zzz: did some work on smaller tunnel build messages (prop. 157), although that work is going a lot slower than the #ls2 team would like
+(08:46:26 PM) zzz: and I reported a major SSU bug to i2pd. they've fixed it. I'm hopeful they will cut a release for it this month, as I think it's really affecting network performance for some subset of connections
+(08:46:35 PM) zzz: eot
+(08:46:44 PM) eyedeekay: Thanks zzz
+(08:47:25 PM) zlatinb: I would like to do some experiments wrt tuning RED in the testnet.  Current theory is that it's way too aggressive and slows down single-stream connections to an unnecessary degree.  Will report as usual.  EOT
+(08:47:36 PM) eyedeekay: Thanks zlatinb
+(08:48:17 PM) eyedeekay: 6) Trac migration summary
+(08:48:17 PM) zzz: re: roadmap. I updated it today on the website to reflect what was in .49 and moved other stuff to .50. eyedeekay please do the same for the items you know about
+(08:48:32 PM) eyedeekay: Ack zzz, will do that this evening
+(08:51:18 PM) wodencafe left the room (quit: Read error).
+(08:51:37 PM) wodencafe [wodencafe@4qx5zjj3rypztq5h4kc2clviwid5cir7cm6iqrqa2l2npvlgt7ta.b32.i2p] entered the room.
+(08:51:51 PM) eyedeekay: Re: trac I am in a rock and a hard place here. I'm admin on trac and not the box that trac runs on. I can't do anything to update it or make it better on my own, all I can do is chase time-consuming issues.
+(08:51:51 PM) eyedeekay: I really want to get rid of it, but we obviously can't blow away all those tickets or the rest of the information here.
+(08:51:51 PM) eyedeekay: I'm proposing that we migrate trac tickets to gitlab tickets and encourage the use of gitlab for issue-tracking purposes
+(08:52:51 PM) eyedeekay: Trac tickets don't map 1:1 onto gitlab tickets, tickets for I2P applications will need to be added to the i2p.i2p issue tracker and tagged on gitlab with the corresponding application
+(08:54:04 PM) eyedeekay: I've finally figured out how to do it using some of the corresponding material from Tor
+(08:54:37 PM) zzz: that's probably the right answer, but we should probably do a quick evaluation of the alternatives, for example just copying over everything to trac on a box we control
+(08:54:51 PM) zzz: and again, an estimate of the one-time and ongoing resources required
+(08:55:18 PM) zzz: we were going to have a meeting a couple months ago on it, so perhaps now it's time
+(08:55:54 PM) lithium left the room (quit: Quit: leaving).
+(08:56:02 PM) eyedeekay: Instinctively, running 2 services(Trac and Gitlab) will probably be higher effort over time, but maybe less effort initially
+(08:56:05 PM) zzz: i just want to be clear on what we're trying to accomplish
+(08:56:05 PM) lithium [lithium@f25fchfdvktukmhg2rkz5es4mlrroyywcou27bpr4mxzfuf3jgya.b32.i2p] entered the room.
+(08:56:38 PM) zzz: a full migration to gitlab is an enormous fix for the problem of somebody not responding to emails
+(08:56:50 PM) zzz: so the question is what else do we get for it
+(08:57:58 PM) zlatinb: tight integration with git, MRs, code review, all that
+(08:58:02 PM) zzz: and we need a short list of our requirements, esp. for registration and anti-spam
+(09:00:01 PM) zzz: I also think we should take lessons from the git migration last year, and have clear milestones and schedule and status
+(09:00:36 PM) eyedeekay: Registration has become a difficult point. I estimate roughly 1/3 of registrations are spam, but it's so difficult to tell the difference because I do not ask for very much information from git users
+(09:01:37 PM) eyedeekay: Tor's solution re: anonymous registration is neat, and potentially very useful, but the more I look at it the more I think it may be overkill for us
+(09:02:35 PM) zzz: I propose that we find out who wants to be in a meeting about this, and then we'll schedule the meeting later
+(09:03:29 PM) eyedeekay: I can work with that. I'll start a new forum thread for the Trac Migration.
+(09:04:49 PM) zzz: zlatinb, would you like to be in on it?
+(09:05:03 PM) zlatinb: sure
+(09:05:21 PM) zzz: super
+(09:07:56 PM) eyedeekay: That's everything from the agenda, anything else to add?
+(09:08:00 PM) eyedeekay: Timeout 60s
+(09:09:32 PM) eyedeekay: That closes the meeting *baffs*
+(09:09:32 PM) eyedeekay: Thanks zzz zlatinb for coming, I'll post the meeting log to the site shortly
+(09:10:09 PM) zzz: thank you
+(09:11:05 PM) devcron left the room (quit: Quit: leaving).
+(09:11:11 PM) eyedeekay: no problem zzz

i2p2www/meetings/logs/297.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, March 2, 2021 @ 20:00 UTC
+==========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/298.log

@@ -0,0 +1,264 @@
+(04:02:03 PM) eyedeekay: Hi everyone, zzz, zlatinb, community members, welcome to the April 6, 2020 meeting
+(04:02:09 PM) eyedeekay: A lot to discuss today:
+(04:02:12 PM) eyedeekay: 1) Hi
+(04:02:12 PM) eyedeekay: 2) Mac Launcher Report, jpackage/dmg
+(04:02:12 PM) eyedeekay: 3) Mac user interest survey results
+(04:02:12 PM) eyedeekay: 4) Windows all-in-one installer
+(04:02:12 PM) eyedeekay: 5) Update channels - http://git.idk.i2p/i2p-hackers/i2p.i2p/-/wikis/...
+(04:02:12 PM) eyedeekay: 6) Trac Migration Report/Evaluation
+(04:02:12 PM) eyedeekay: 7) 0.9.50 release
+(04:02:39 PM) eyedeekay: 1) Hi is everybody here?
+(04:02:43 PM) zzz: hi
+(04:02:46 PM) eyedeekay: Hi zzz
+(04:02:54 PM) zlatinb: hi
+(04:02:59 PM) eyedeekay: Hi zlatinb
+(04:03:08 PM) eyedeekay: Anybody else?
+(04:03:40 PM) eyedeekay: OK On to 2) then Mac Launcher Report
+(04:04:13 PM) eyedeekay: This was my topic but I think zlatinb and I should share it a bit, I have more to add to the User Interest Survey section
+(04:04:54 PM) zlatinb: ok
+(04:05:24 PM) eyedeekay: The current situation as I understand it is that we've decided that the old launcher is not the way, reflected in zzz removing the code from the main git branch this morning
+(04:07:04 PM) eyedeekay: And that we can deal with the issue of doing updates in the background in order to avoid making the update process more complicated while making the install process less
+(04:08:42 PM) eyedeekay: That "real" service installs probably won't be part of the jpackaged version of the router, because auto-starting apps start when the user logs in and not when the system is ready
+(04:08:53 PM) zlatinb: I think that is accurate.  I have verified that the sequence of steps in the script that is on the wiki page is completely "silent"
+(04:08:53 PM) zlatinb: the end-to-end flow needs to be tested ofc
+(04:08:53 PM) zzz: yeah I think the install experience is better, the update experience could be a little to a lot worse, TBD
+(04:09:25 PM) zzz: although if you include java updates in the izpack update experience, maybe we wouldn't be any worse
+(04:09:28 PM) mode (+v anonymousmaybe) by ChanServ
+(04:09:39 PM) zzz: thats the part we need to investigate further
+(04:09:58 PM) zzz: and decide how to make those tradeoffs
+(04:11:17 PM) eyedeekay: I think I think the Java nagware makes it almost the same
+(04:11:34 PM) eyedeekay: But I haven't actually had to do a Java update on my Mac yet either
+(04:12:35 PM) zzz: do we have any quantitative sense of how much better JRE 16 is over 8?
+(04:12:37 PM) eyedeekay: There was a slightly surprising result on the user-interest survey, a slim majority of users found installing Java to be easy, including one user who marked him or herself as a beginnger
+(04:13:37 PM) zlatinb: 16 vs 8? not atm, can google for benchmarks ofc, but the new apis are useful
+(04:14:01 PM) zlatinb: such as getting the pid from inside java, dock badges and notifications, etc.
+(04:15:14 PM) zlatinb: regarding an investigation of the full update process, it will organically be done as part of the work on the new update process, to be discussed later in this meeting
+(04:16:19 PM) zlatinb: I'm confident it can be very smooth; the implementation question is AppleScript vs bash script vs ?? 
+(04:16:57 PM) zzz: I thought it was just exec 'open xxx.dmg'?
+(04:17:54 PM) zlatinb: someone hasn't been following the wiki page tsk tsk :)  no it's a quite involved process of converting the .dmg to another format.  That avoids any visual promopts and license agreement
+(04:19:12 PM) zlatinb: basically 1. convert the .dmg to .cdr 2. mount cdr 3. move the existing AppBundle out of the way 4. cp -R new AppBundle 5. clean up, unmount .cdr 6. launch new app bundle
+(04:20:12 PM) zlatinb: I tested and verified the conversion and mounting are entirely "silent".  If we do not want to be silent but want the user to see what is happening, we can use AppleScript
+(04:20:20 PM) zlatinb: no idea why we would want that but it's on the table
+(04:21:14 PM) eyedeekay: Neat. Not that I think it matters that much, but is that how .dmg bundles are "supposed" to update? Is there a chance that would be disabled in the future without a path to fix it?
+(04:22:03 PM) zlatinb: the official way of updating is to use a Mac OS facility that relies on the existence of a clearnet server.  VLC updates that way for example.
+(04:22:30 PM) zzz: given the size of the agenda, I suggest we move on to find out if the survey says anybody wants this at all
+(04:22:49 PM) eyedeekay: Can do
+(04:23:49 PM) eyedeekay: The results of the survey summarized as follows:
+(04:23:49 PM) eyedeekay:  - Most of the people surveyed did not have Java installed when they were first  attempting to install I2P.
+(04:23:49 PM) eyedeekay:  - Users found installing Java easy, with a slim majority(3/5) of respondents saying that installing Java was not difficult. This included people who marked themselves as "beginner" computer user. This actually surprised me quite a bit.
+(04:23:49 PM) eyedeekay:  - 6 of 12 users skipped some or all of the Yes/No questions.
+(04:23:49 PM) eyedeekay:  - We had several users who skipped multiple Yes/No questions who left free-response answers. They were universally not complimentary to the install process.
+(04:23:49 PM) eyedeekay:  - All but one of the Yes/No respondents who answered the question were users of the .dmg bundle. Of these, there were 5/13. All others were non-responses. This  could indicate the overwhelming popularity of the .dmg approach.
+(04:23:49 PM) eyedeekay:  - The one non-user of the old .dmg bundle answered "Yes" to would use a new one if it emerged
+(04:24:31 PM) eyedeekay: That's copied directly from a longer summary I'll post to zzz.i2p later today
+(04:25:16 PM) zzz: we didn't ask directly if people want a dmg installer vs izpack? Or how can we infer that?
+(04:26:02 PM) eyedeekay: We referred to the izpack as the ".jar" installer since end users don't know what packaging tools we use
+(04:26:09 PM) zzz: or, an even simpler question: does the survey tell us we should do a dmg installer or not?
+(04:26:25 PM) eyedeekay: I believe the survey supports doing a .dmg installer
+(04:26:52 PM) zzz: strongly? weakly? "overwhelmingly"?
+(04:27:25 PM) eyedeekay: Pretty strongly, the only counterpoint to the .dmg installer was that people found installing Java easy
+(04:27:41 PM) eyedeekay: Thereby recommending the incumbent in that case
+(04:27:51 PM) zzz: ok
+(04:28:03 PM) eyedeekay: Everybody who answered the question said ".dmg installer"
+(04:28:47 PM) zlatinb: but that hasn't even been available for download for a while.  Do we know if they refer to the experimental one we just built or to the old one?
+(04:29:08 PM) eyedeekay: I specifically asked "The .dmg installer which lost support earlier this year"
+(04:29:17 PM) zlatinb: ok
+(04:29:51 PM) eyedeekay: Also I asked about whether they were able to transition from the old .dmg installer back to an IzPack installer
+(04:30:16 PM) eyedeekay: No one was able, but I think we knew that because of the unstoppable restarts issue
+(04:30:18 PM) mode (+v subatomic) by ChanServ
+(04:31:20 PM) zlatinb: that issue may have been specific to my system, I have no way of knowing.  I may have helped meeh run an interim build that may have been broken... many possibilities.
+(04:32:50 PM) eyedeekay: I remember seeing it on my old Mac that was a lemon so same
+(04:32:59 PM) eyedeekay: I'll have an extended summary with the raw anonymized results to post to zzz.i2p this evening
+(04:33:03 PM) eyedeekay: EOT #3
+(04:34:22 PM) zlatinb: I would ask that we go back to #2 for a bit
+(04:34:32 PM) zlatinb: and at least decide on a deadline for making a decision
+(04:35:05 PM) zlatinb: because with the lack of notarization the current izpack installer is pretty hideous.  Sadie posted on medium the full workflow and it's something like 35 steps
+(04:35:24 PM) zlatinb: that include the user turning off some OS protections which are on by default
+(04:35:53 PM) zlatinb: fyi I asked orignal and some guy from the ilita irc what they do for i2pd
+(04:36:10 PM) zlatinb: and the short answer was: disarm all assemssments and roll with it
+(04:36:32 PM) zzz: I'm not hearing any objections, so I think we keep working toward a solution. I'm not sure we need a deadline, especially if the effort is modest
+(04:36:33 PM) zlatinb: I really don't think we can expect our users to do that
+(04:37:20 PM) zlatinb: effot is modest if we do not count the update system overhaul which we'll discuss separately
+(04:37:33 PM) zlatinb: eot
+(04:37:55 PM) zzz: ok, then we'll find out what the deadline is to resolve the update stuff
+(04:38:53 PM) zlatinb: ok
+(04:40:25 PM) eyedeekay: Are we deciding that here and now? Because my vote would go to having it all ready to phase in at 0.9.51.
+(04:40:58 PM) zlatinb: we'll discuss it as part of 5), right?
+(04:41:09 PM) eyedeekay: Sure sounds good
+(04:41:21 PM) eyedeekay: On to 4) then Windows all in one installer
+(04:41:49 PM) eyedeekay: zlatinb added this to the agenda, but I'll probably have a lot to add here too. Do you want to get us started zlatinb?
+(04:42:40 PM) zlatinb: well eyedeekay did most of the hard work on combining the firefox profile installer with a JRE image and a router and making sure it installs and runs.  There's ofc some rough edges atm.
+(04:42:59 PM) zlatinb: There's also a wiki page that can be used for questions
+(04:43:30 PM) zlatinb: I think it's worth giving it some attention and spending the time to do a proper product definition with requirements and all that, similar to what was done for the .dmg
+(04:43:58 PM) zlatinb: We're working with users on r/i2p who have helped us greatly and continue to help us
+(04:44:15 PM) zlatinb: but ofc atm this is a PoC
+(04:44:15 PM) zlatinb: eot
+(04:45:38 PM) zzz: there seems to be no wikis listed on the index page at http://git.idk.i2p/i2p-hackers/i2p.i2p/-/wikis/home so ppl need the full url?
+(04:45:41 PM) eyedeekay: Yes despite being an early POC, most of the feedback I've received has been positive. One unfortunate thing is that apparently NSIS goes crazy if the user has a different character set than the administrator, the hardest part has been avoiding this pitfall so far
+(04:46:01 PM) eyedeekay: Right-hand side for me, I'll get you the full URL
+(04:46:29 PM) eyedeekay: https://i2pgit.org/i2p-hackers/i2p.firefox/-/wikis/All-in-One-I2P-Installer-for-Windows
+(04:47:08 PM) zzz: hmm if not logged in it says 'no wiki pages'. if logged in it gives you a 'create new wiki' page.
+(04:47:57 PM) zlatinb: check that you're in i2p.firefox project, not i2p.i2p
+(04:48:07 PM) zzz: oh ok
+(04:49:19 PM) psi: hi (lurking)
+(04:49:42 PM) zlatinb: hi psi
+(04:49:52 PM) eyedeekay: Hi psi
+(04:50:07 PM) eyedeekay: And here's the branch in case you need it: https://i2pgit.org/i2p-hackers/i2p.firefox/-/tree/EXPERIMENTAL-jpackage
+(04:50:34 PM) psi: wasn't there talk about using nsis for windows packaging?
+(04:50:56 PM) eyedeekay: Yes this is some of that talk
+(04:50:56 PM) psi: (that's item 4 nvm)
+(04:51:27 PM) psi: oh
+(04:51:30 PM) psi: i see we are on that
+(04:51:55 PM) psi: so if you are using cmake/cpack nsis is great because you cross compile for windows from linux trivially
+(04:52:04 PM) psi: not sure how it works in java land
+(04:52:23 PM) zzz: I've raised a few objections about this windows proposal over the last month, none fatal, but I don't think they've been adequately addressed
+(04:52:29 PM) zzz: I'll list 3 here
+(04:52:47 PM) eyedeekay: Unfortunately we might to this to take advantage of jpackage builds, which do require us to build on the target platform at this time
+(04:53:03 PM) zzz: 1) it's all a distraction from the mac installer that got us started and is probably higher priority and we'll learn from doing it first
+(04:53:15 PM) psi: point 1 is enough there
+(04:53:24 PM) zzz: 2) almost all the justifications listed or theorized are weaker than that for the mac installer
+(04:53:34 PM) psi: i'd say focus on the mac infra before wandering out into the packaging aybss
+(04:53:55 PM) psi: you'll find a way to have scope creep
+(04:53:57 PM) zzz: 3) the so-far-unofficial firefox profile is assumed included, but hasn't been justified or reviewed separately
+(04:54:02 PM) zzz: eot
+(04:54:31 PM) psi: for now macos packaging is plenty of a task and you need not increase scope
+(04:54:47 PM) psi: once you get the macos infra working come back to windows nsis 
+(04:55:03 PM) psi: i for one want to drop macos support at work becuase it's just bad
+(04:55:12 PM) psi: the whole target is getting worse with each release
+(04:55:33 PM) psi: and apple is actively hostile to free software projects
+(04:55:51 PM) psi: if you dont mind bending over to let apple in then it's probably fine
+(04:56:10 PM) zlatinb: well that's a picturesque way of putting it psi :)
+(04:56:12 PM) psi: it's all a question of how much time you want to burn dealing with them
+(04:56:29 PM) psi: if the number of users is low enough it's just not worth it
+(04:56:39 PM) eyedeekay: I can definitely live with waiting for Mac to be ready to take Windows further, I think everyone sees my point re: the installer and it's relationship to onboarding
+(04:57:00 PM) zlatinb: but I've already gone through the joys of notarization so that part's taken care of
+(04:57:10 PM) zlatinb: (that's the most unpleasant part btw)
+(04:57:33 PM) psi: so this is a kind of high level directional question, windows is actually getting a bit better and apple is getting worse, the projected direction each are going is pretty clear to me
+(04:57:52 PM) psi: if we dont have a dedicate mac guy then the mac parts will rot
+(04:58:00 PM) psi: dedicated mac guy*
+(04:58:05 PM) psi: that is what happened at work D:
+(04:58:34 PM) zlatinb: well I try to document everything that I do, but you're right, one of the requirements is an Apple Id which means de-anoning
+(04:58:44 PM) psi: that's probably fine
+(04:58:50 PM) psi: the real problem is the everything else part
+(04:58:57 PM) zlatinb: it's not that bad
+(04:59:05 PM) psi: it is if you need eleveated privs
+(04:59:05 PM) zlatinb: we can discuss after the meeting if you're interested
+(04:59:16 PM) psi: for i2p is fine
+(04:59:16 PM) zlatinb: we don't for I2P, it's a slide install
+(04:59:19 PM) zzz: the thing I still don't understand is that we had a broken link to the old dmg installer for a year and nobody complained. during that time we thought we had a dedicated mac guy, but he vanished
+(04:59:19 PM) psi: and yea we can talk later
+(04:59:30 PM) psi: yea
+(04:59:44 PM) psi: if a mac users tries it and it's broken they'll just uninstall
+(04:59:48 PM) psi: they wont report a bug
+(04:59:52 PM) zlatinb: exactly
+(05:00:03 PM) psi: and with i2pd being a thing they can just try that
+(05:00:12 PM) psi: if i2pd works they'll use that
+(05:00:16 PM) eyedeekay: I bet if I really combed I could find a reddit question
+(05:00:25 PM) zlatinb: it doesn't, requires disarming all assessments
+(05:00:53 PM) eyedeekay: But another factor is that until a few months ago the .dmg installer would have installed and may have updated, because the signature on it hadn't expired yet
+(05:02:24 PM) zlatinb: there is like one mac guy on ilita and he is a very advanced mac user
+(05:02:33 PM) zlatinb: anyway, we're drifting
+(05:02:33 PM) psi: yea
+(05:02:33 PM) zlatinb: psi is right that mac users won't complain and just give up
+(05:02:33 PM) psi: are there regular project level UX aditing for each platform?
+(05:02:33 PM) zzz: not true, the link was broken as of 0.9.44, because the last dmg release was .43
+(05:02:33 PM) psi: i.e. seeing if platform X is broken?
+(05:02:33 PM) zlatinb: sadly no
+(05:02:33 PM) psi: thinking out loud i see a common overaching theme
+(05:02:33 PM) psi: over arching theme
+(05:02:34 PM) zzz: correction .45 was the last, broken as of .46
+(05:03:03 PM) zlatinb: we had the windows installer broken for two days until parg complained about it, just a data point
+(05:03:27 PM) zzz: one hour in, eyedeekay can you keep things moving please?
+(05:03:35 PM) eyedeekay: Yes
+(05:03:52 PM) eyedeekay: I think we've done enough on #4 for now anyway
+(05:03:58 PM) psi: yea
+(05:04:07 PM) eyedeekay: 5) update channels
+(05:04:21 PM) eyedeekay: This one is yours zlatinb
+(05:04:56 PM) zlatinb: right, so the main purpose of update channels is to support the new installers, but of course it can turn out to be useful in other situations as well.
+(05:04:57 PM) zlatinb: such as:
+(05:05:16 PM) zlatinb: if we decide to transition to stable-vs-beta releases after 1.0.0
+(05:05:46 PM) zlatinb: to summarize what's on the wiki page:
+(05:06:09 PM) zlatinb: we introduce the notion of an update channel which is platform X readiness tuple
+(05:06:29 PM) psi: i2p has been effectively rolling release for a decade right?
+(05:06:57 PM) zlatinb: to do it in backwards-compatible way with least amount of work the update url will be constructed http://...b32.i2p/<platform>/<readiness>/news.su3
+(05:07:25 PM) zlatinb: no changes to news.xml format
+(05:08:08 PM) zlatinb: So very little modifications to the workflow of the su3 generators
+(05:08:33 PM) zlatinb: small changes to the backend of the router, and small-to-medium changes to the console ui
+(05:09:04 PM) zlatinb: for more detailed discussion see the wiki page
+(05:09:36 PM) zlatinb: at this meeting I would like to agree on what priority this should be, when do we want it done, who will do which part ideally too
+(05:09:38 PM) zlatinb: eot
+(05:10:04 PM) zzz: the issues are who runs and manages and translates the new feeds and their backups ... same as now, or different
+(05:10:11 PM) zzz: if it's option 1 then it's almost no dev effort
+(05:10:35 PM) zlatinb: oh yeah option 2 (from the wiki page) is out, ignore it completely
+(05:10:59 PM) zzz: so are you proposing the same news hosts as now for the new feeds? (ech and idk), if so, need their buyin, if not, need to know who
+(05:11:44 PM) zlatinb: I would say start with the same hosts for now
+(05:12:08 PM) eyedeekay: I'm absolutely happy to host the new feeds on my end
+(05:12:27 PM) zlatinb: I'll reach out to ech sometime soon about it
+(05:13:51 PM) eyedeekay: Since option 2 is out by extension option 3 is as well, right?
+(05:13:59 PM) zlatinb: yeah
+(05:14:36 PM) zlatinb: option 1 achieves everything and is very little effort relative to the other options
+(05:15:31 PM) zlatinb: so... 
+(05:16:23 PM) zlatinb: since this is a prerequisite for enabling in-network updates of a .dmg installer and we seem to be in agreement that we're going ahead with that, shall we say 0.9.51 for this item?
+(05:16:49 PM) eyedeekay: +1
+(05:17:08 PM) zzz: oh I thought you wanted a deadline for deciding. thats a deadline for finishing
+(05:17:24 PM) zzz: but sure, that's a reasonable target
+(05:17:50 PM) zlatinb: I wanted a deadline for deciding on the .dmg installer.. but I can retreat if there are reasonable arguments against deciding now :)
+(05:18:03 PM) mode (+v val) by ChanServ
+(05:18:26 PM) zzz: sounds good
+(05:19:10 PM) zlatinb: ok... we have one more meeting before the 0.9.51 cycle starts in earnest, right?
+(05:19:17 PM) eyedeekay: Yes we do
+(05:19:44 PM) zlatinb: we can then expand on the details on the wiki, including specific code locations that need to change by then
+(05:19:56 PM) zlatinb: I'm reluctant to start actual coding even if on a branch
+(05:20:18 PM) zzz: there shouldn't be any coding really, or very little
+(05:20:37 PM) zlatinb: I'll try to scope it out by the next meeting
+(05:21:18 PM) zlatinb: ok, that's eot from me on 5)
+(05:21:26 PM) eyedeekay: Ok then moving on to 6) Trac Migration Report/Evaluation
+(05:22:30 PM) eyedeekay: I've made a chart, it's been approved, I've done a dry run on a server at home, it worked. There are hundreds of tickets to migrate, almost all of which will be added to i2p.i2p with tags corresponding to the "component" they were on trac.
+(05:23:54 PM) eyedeekay: I think I can do the whole migration this month and have it done by the start of the next meeting. I'm going to go from small-to-large like I did with mtn->git. I'm going to go much faster this time, most of these can expected to take one day or less to complete. I'll be starting with i2p.www
+(05:24:21 PM) zzz: have we definitely decided to do it, or are there open issues e.g. registration for tickets, spam, etc. ?????
+(05:24:29 PM) mode (+v anonymousmaybe) by ChanServ
+(05:24:59 PM) eyedeekay: Spam has dropped considerably over the past month, user registrations are now open without my approval. Anyone who can confirm an email can register.
+(05:25:32 PM) eyedeekay: I can still "approve" users who cannot or do not wish to use a real e-mail.
+(05:25:35 PM) zzz: iirc we know where we're headed but we haven't made the final decision yet, especially because of the reg. issue
+(05:25:53 PM) zzz: but I don't have last month's meeting logs in front of me
+(05:26:14 PM) eyedeekay: The biggest issue, approval-only for registration, is no longer the case
+(05:26:48 PM) zzz: ok so that and the migration tech issues were the biggest. anything else that's a blocker, or are you recommending we proceed?
+(05:27:35 PM) eyedeekay: I am believe that I should proceed this month with the ticket migration
+(05:27:45 PM) mode (+v dr|z3d) by ChanServ
+(05:27:51 PM) zzz: sounds good
+(05:28:02 PM) eyedeekay: OK I'll get started probably at the end of this week
+(05:28:26 PM) eyedeekay: Last but not least the 7) 0.9.50 release update
+(05:28:29 PM) zzz: oh I remember
+(05:28:29 PM) zzz: notifications
+(05:28:40 PM) zzz: on tickets, MRs, etc. seem completely broken
+(05:29:04 PM) zzz: ofc they are on trac also...
+(05:29:44 PM) zzz: so maybe not a blocker but def. an annoyance
+(05:29:47 PM) eyedeekay: Are you not getting them? I thought I had them fixed, I started getting mine. I'll figure out why it is and deal with it ASAP
+(05:30:19 PM) zzz: nope. zlatinb how about you?
+(05:30:28 PM) zlatinb: nada
+(05:30:34 PM) zlatinb: did get a few at one point but after the update or downtime nothing
+(05:30:55 PM) zlatinb: but I check the activity feeds obsessively :)
+(05:31:19 PM) eyedeekay: Shoot. OK I must have missed it when I put the server back up after the thing in December. I'll fix it soon.
+(05:31:38 PM) eyedeekay: Wait no I have an email from zzz on the X-i2p-location issue...
+(05:31:46 PM) eyedeekay: Can't be that. Anyway, I'll find it
+(05:32:14 PM) zzz: thanks
+(05:32:16 PM) zzz: re: 7)
+(05:32:23 PM) zzz: I'll be very brief
+(05:32:37 PM) zzz: we're 7 weeks into a nominal 12 wk cycle, target mid-to-late May
+(05:32:45 PM) zzz: all big changes should be in
+(05:32:49 PM) zzz: lots of SSU and IPv6 stuff
+(05:33:08 PM) zzz: doing testing w/ i2pd on prop. 158 (ipv6 introducers)
+(05:33:18 PM) zzz: for draft release announcement see zzz.i2p
+(05:33:20 PM) zzz: EOT
+(05:33:52 PM) zlatinb: I just want to chime in re: bandwidth utilisation
+(05:34:04 PM) zlatinb: this release has the potential to improve throughput by a LOT
+(05:34:40 PM) zlatinb: so with the changes to RED and CDQ tuning we should keep an eye on whatever network metrics we can get
+(05:34:50 PM) zzz: let's hope. also lots of i2pd fixes in their mid-cycle release a couple weeks ago, and more in the next one, will help network performance
+(05:35:38 PM) zlatinb: I'm just worried we'll hit some bottlenecks that we never hit before
+(05:35:50 PM) zlatinb: but that's growing pains I guess
+(05:36:09 PM) zzz: same story different day
+(05:36:48 PM) eyedeekay: Thanks zzz, thanks zlatinb.
+(05:37:53 PM) eyedeekay: I've got very little to add here, and I think we've been here long enough, so unless there's anything else you want to discuss I'm going to call us to a close
+(05:38:03 PM) eyedeekay: Timeout 1m
+(05:39:19 PM) eyedeekay: Thanks everyone for coming, see around IRC
+(05:39:31 PM) eyedeekay: I will post meeting logs in a few minutes

i2p2www/meetings/logs/298.rst

@@ -0,0 +1,12 @@
+I2P dev meeting, April 6, 2021 @ 20:00 UTC
+==========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb,
+psi

i2p2www/meetings/logs/299.log

@@ -0,0 +1,113 @@
+(04:01:04 PM) eyedeekay: Hi everyone, it's time for the May 4th meeting
+(04:01:13 PM) zlatinb: hi
+(04:01:21 PM) zzz: hello
+(04:01:39 PM) eyedeekay: 1) Hi 
+(04:01:39 PM) eyedeekay: 2) Mac Launcher Report, Follow-up 
+(04:01:39 PM) eyedeekay: 3) Trac Migration Report, Post-op 
+(04:01:39 PM) eyedeekay: 4) 0.9.50 release
+(04:01:39 PM) eyedeekay: 5) Update Channels Report
+(04:01:39 PM) eyedeekay: 6) Docker Improvements
+(04:01:39 PM) eyedeekay: 7) Bote Plugin Keys
+(04:02:17 PM) eyedeekay: zab are 2) and 5) likely to overlap, should I put them together?
+(04:02:26 PM) zlatinb: sure
+(04:02:56 PM) eyedeekay: OK so let's swap 3 and 5 from that list above, and do update channels right after Mac Launcher
+(04:03:11 PM) eyedeekay: 2) Mac Launcher Report
+(04:03:59 PM) zlatinb: so far I've received one positive report by an unknown user, and know at least a few people have tried the .dmg
+(04:04:28 PM) zlatinb: so for the installer part I think we're in a very good shape.  I can't think of any changes required that are not related to the update functionality
+(04:04:49 PM) zlatinb: s/installer/app bundle/
+(04:05:24 PM) zlatinb: that's all on stricly-2) from me
+(04:06:10 PM) eyedeekay: Excellent. I don't have anything to add right, so we can move on to 3) Update Channels
+(04:06:24 PM) eyedeekay: Unless zzz has something?
+(04:06:36 PM) zzz: no
+(04:07:00 PM) eyedeekay: Ok then zlatinb update channels are also your topic
+(04:07:22 PM) zlatinb: zzz and I did some initial analysis/scoping of what needs to happen to enable update channels
+(04:08:05 PM) zlatinb: the consensus (I think) is that there will be some changes to code in i2p.i2p as well as some code residing in the mac-jpackage repo
+(04:08:36 PM) zlatinb: we're still enumerating all the corner cases but so far haven't come upon a dealbreaker
+(04:09:24 PM) zzz: agreed, sounds pretty straightforward and not too much effort. testing is probably more of the work than coding
+(04:09:36 PM) zlatinb: I'm very busy until the release but after that will focus on this.  Can get more technical but it gets very low-level for this meeting
+(04:09:39 PM) zlatinb: eot
+(04:10:05 PM) eyedeekay: Thanks for the report
+(04:10:12 PM) eyedeekay: That brings us to 4) 0.9.50 release
+(04:11:08 PM) dr|z3d: you missed Trac migration.
+(04:11:26 PM) eyedeekay: I was going to do it as 5, not 4
+(04:11:40 PM) dr|z3d: ok, as you were!
+(04:11:45 PM) eyedeekay: We're 11 days away from the release now
+(04:12:09 PM) eyedeekay: Tags are set to be frozen tomorrow
+(04:12:22 PM) eyedeekay: I have no more string changes for i2p.i2p
+(04:13:43 PM) eyedeekay: zzz, zlatinb what would you like to add?
+(04:14:08 PM) zzz: not much... I'll push the strings to transifex at 4 PM UTC tomorrow
+(04:14:26 PM) zlatinb: orignal made an interesting point just 30 minutes ago about NTCP queue capacity, might be worth looking into b4 the release
+(04:14:27 PM) zzz: I'm done with 50. already working on the next one
+(04:15:18 PM) zzz: I didn't see it, but I'd be reluctant to make any changes now. I am testing some NTCP queue changes for the next release
+(04:15:29 PM) zzz: eot
+(04:15:38 PM) zlatinb: eot from me too
+(04:15:53 PM) eyedeekay: 5) Trac Migration Report, Post-op
+(04:16:35 PM) eyedeekay: Trac migration was sticky mostly for the reasons I felt it needed to happen, in particular trac xmlrpc broke on our instance at about the same time as last months meeting
+(04:17:34 PM) eyedeekay: After trying and failing to fix it for a couple weeks I just decided it would be easier to (carefully) scrape our trac issues down and migrate them to gitlab using the gitlab API
+(04:18:20 PM) eyedeekay: Otherwise, it was successful, and as a by-product created a readable static archive of all our trac tickets at this time
+(04:18:32 PM) eyedeekay: eot
+(04:18:44 PM) zzz: so whats the status? done?
+(04:19:16 PM) eyedeekay: For the purposes of tracking tickets, trac migration is done. Trac still has wiki articles of some interest to back up but the tickets are done.
+(04:19:43 PM) zzz: ok. I changed the urls in our code to point to gitlab
+(04:20:14 PM) eyedeekay: I changed most of the ones on the website, but am still grepping through .rst files for the last few
+(04:20:28 PM) zzz: can you please add notes and links on trac home page and ticket page and login page and wherever else, with new i2p and clearnet links?
+(04:20:42 PM) eyedeekay: Sure, will do
+(04:21:49 PM) zzz: this now makes us reliant on gitlab (when it was just code, we could always use github) ... do we have any backup admin?
+(04:21:49 PM) eyedeekay: I will also go through all the README's and make sure they reference the correct places too
+(04:22:50 PM) eyedeekay: echelon has an admin account on gitlab, but no one else has SSH access to the server underneath right now
+(04:22:50 PM) mode (+v anonymousmaybe) by ChanServ
+(04:23:30 PM) eyedeekay: I can look into syncing the issues with github using a bot, it's not that different than the second half of the migration process
+(04:23:39 PM) zzz: ok, you two may want to review who can do what to make sure we're covered
+(04:23:45 PM) zzz: good job
+(04:24:09 PM) eyedeekay: Thanks
+(04:24:22 PM) eyedeekay: That brings us to 6) Docker Improvements
+(04:24:42 PM) eyedeekay: zlatinb do you want to fill the people who haven't tried them yet in here :)
+(04:25:10 PM) zlatinb: lol yes, the new docker image is smaller and supports persistent volumes for configuration and snark downloads
+(04:25:35 PM) zlatinb: documentation is in the source, the Docker.md file.  I would like to add a page to the website with that same content
+(04:26:03 PM) zlatinb: that's really it
+(04:26:30 PM) eyedeekay: Good call about the site, right now we advertise it but don't document how to use it at all
+(04:26:40 PM) zzz: who is in charge of the geti2p docker account and who else has access?
+(04:26:48 PM) zzz: or does it not work like that?
+(04:27:35 PM) zzz: does it just auto-build every checkin and that's it?
+(04:27:37 PM) eyedeekay: I'm in charge of the geti2p docker account, I can grant access to people from gitlab, it was started by Ace Barry or hkparker IIRC but I'm the admin now
+(04:28:04 PM) eyedeekay: It builds the `latest` every checkin and builds an image for every tag beginning in `i2p-*`
+(04:28:50 PM) zzz: ok so whatever changes zlatinb did are already in there
+(04:28:52 PM) zzz: got it
+(04:29:00 PM) zlatinb: yes
+(04:29:30 PM) zlatinb: eyedeekay: I saw you just dockerized the android build process?
+(04:30:50 PM) eyedeekay: Yeah I did, it was a way of bundling up all the release requirements into a re-usable form
+(04:31:35 PM) zzz: eyedeekay, speaking of android, I saw something about google adding more rules and bumping requirements effective later this year. You may wish to put aside some time before this release to get ahead of it
+(04:33:10 PM) eyedeekay: I'm double-checking all my Android release stuff this week to make sure that all goes smoothly
+(04:34:18 PM) zzz: as I said the new rules aren't effective for a few months but wouldn't hurt to address them now
+(04:34:41 PM) zzz: or, it might hurt, but better sooner than later
+(04:34:42 PM) zzz: eot
+(04:35:14 PM) eyedeekay: Well depends on F-Droid, sometimes they lag behind GPlay in requirements in a way which is somewhat mutually-exclusive, but it'll be better to know about it if it's going to happen
+(04:36:02 PM) eyedeekay: I think we're ready for number 7) Bote Plugin Keys
+(04:36:20 PM) eyedeekay: This one came up for me in conversation with some redditors last week
+(04:37:06 PM) eyedeekay: People are trying to use mhatta's fork of Bote but they are not able to do so because they are not able to install the plugin keys easily
+(04:37:30 PM) eyedeekay: They also mostly don't know how to intepret the certificate error in the sidebar to troubleshoot the issue
+(04:38:17 PM) eyedeekay: s/keys/certificates/
+(04:38:41 PM) eyedeekay: I would like us to consider adding mhatta's to the default so people no longer encounter this error
+(04:39:17 PM) zzz: 1) he should provide better instructions to his users; 2) he needs to make the request of us
+(04:40:22 PM) eyedeekay: Fair enough.
+(04:40:46 PM) eyedeekay: That brings us to the end of the listed topics, anything else to add?
+(04:41:06 PM) zlatinb: yes, I'd like us to think about making it easier to build testnets
+(04:41:08 PM) zzz: and I'd ask that he get .49 into debian, which never happened
+(04:41:55 PM) zlatinb: we've had two people build LXC testnets and one person build Docker, all three use quite different approaches
+(04:42:14 PM) zlatinb: so is there any interest in figuring out what the pain points are and making things easier?
+(04:42:51 PM) zzz: I have interest in finding out if there's interest :)
+(04:43:10 PM) eyedeekay: Yes there is from my side, I would like to get a testnet running, preferably a docker one
+(04:44:13 PM) zlatinb: cool.. so we should look into it.. of the top of my head initial seeding is the worst part
+(04:45:14 PM) eyedeekay: Are there any Docker testnet instructions written down yet or are they all LXC-based?
+(04:45:18 PM) zzz: my solution to seeding worked well for me, it's roughly solved for lxc
+(04:45:47 PM) zlatinb: LoveIsGrief may have something in his repos on gitlab 
+(04:47:55 PM) zlatinb: eot from me
+(04:49:07 PM) eyedeekay: I guess then if I want a Docker testnet I should probably look into their work, and fill in whatever blanks I encounter based on the process for LXC
+(04:49:43 PM) zzz: I checked all my horrible lxc shell scripts into i2p.scripts
+(04:50:29 PM) eyedeekay: Thanks zzz, horrible or not I'm sure they'll tell me what I need to know
+(04:51:32 PM) eyedeekay: Anything else for the meeting?
+(04:51:50 PM) eyedeekay: timeout 1m
+(04:51:50 PM) zzz: no
+(04:51:58 PM) zlatinb: not from me
+(04:52:19 PM) eyedeekay: OK then thanks everyone for coming
+(04:52:44 PM) eyedeekay: I'll post the logs to the site shortly, see you around IRC

i2p2www/meetings/logs/299.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, May 4, 2021 @ 20:00 UTC
+========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/300.log

@@ -0,0 +1,136 @@
+(04:01:11 PM) eyedeekay: Hi everyone, welcome to the Tuesday, June 1 Community meeting
+(04:01:25 PM) eyedeekay: 1) Hi
+(04:01:25 PM) eyedeekay: 2) 300 logged community meetings
+(04:01:25 PM) eyedeekay: 3) 0.9.51
+(04:01:25 PM) eyedeekay: 4) go-i2p
+(04:01:25 PM) eyedeekay: 5) reproducible build status
+(04:01:25 PM) eyedeekay: 6) update channels report / Mac bundle report
+(04:01:25 PM) eyedeekay: 7) Next release number, deferred item from April 6 meeting
+(04:01:25 PM) eyedeekay: 8) 0.9.50 status / remaining release items
+(04:01:42 PM) eyedeekay: 1) hi
+(04:01:50 PM) eyedeekay: Hi everybody
+(04:02:08 PM) zzz: hi
+(04:02:10 PM) zlatinb: hi
+(04:02:31 PM) eyedeekay: Hi zzz, hi zlatinb.
+(04:02:31 PM) eyedeekay: Anybody else with us today?
+(04:03:00 PM) eyedeekay: OK 2) 300 logged community meetings
+(04:03:45 PM) eyedeekay: Congratulations everybody, the first meeting we have recorded on the web site was 19 years ago, nearly 20 now, and now we're 300 meeting later
+(04:04:18 PM) eyedeekay: Thanks to all I2P contributors in the past as well as in the present
+(04:04:54 PM) zzz: yes
+(04:05:16 PM) zzz: any eepsites from back then still work
+(04:05:44 PM) zzz: and some bugs from back then are still to be found and fixed! I fixed a bug from 2004 today
+(04:06:58 PM) eyedeekay: I saw that over in #ls2 earlier, especial thanks to zzz who has been the heart and soul of this project for longer than most of us have even been around :)
+(04:07:20 PM) zzz: can't do it alone, never could
+(04:08:11 PM) zzz: but that's all the time you get for reminiscing, let's get on with the work
+(04:08:24 PM) eyedeekay: Again thanks and congratulations to everybody, on to 3) 0.9.51
+(04:09:34 PM) eyedeekay: We're about 2 weeks into this release, for my part I'm working on my X-I2P-Location feature in the default site and thinking about options for integrating a browser profile with a main installer at the moment
+(04:09:59 PM) eyedeekay: What is everyone else working on for this release at this time?
+(04:10:41 PM) zzz: I'd like to remind everyone to update the website roadmap with your plans for the next release. There's not a lot there right now
+(04:11:05 PM) eyedeekay: Ack, thanks for reminding us, I will do mine this evening after the meeting
+(04:11:27 PM) zlatinb: I will be starting the Mac-specific side of the Mac bundle updater, unless we decide to split the work otherwise.  I'm happy to work on the i2p.i2p side as well, will discuss more in point 6)
+(04:11:32 PM) zzz: the #ls2 team is continuing to work on proposal 157 (new tunnel build messages), it's going slower than planned. Not clear right now how much will get into the next release
+(04:12:09 PM) zzz: the proposal is still incomplete, so until we do that, we can't finish the code
+(04:12:42 PM) zzz: SSU2 is still not started. We had hoped to have it done this year... that seems unlikely at this point. We could use some more help
+(04:12:56 PM) zzz: EOT
+(04:14:15 PM) eyedeekay: Thanks zzz, zlatinb. I'll do what I can to contribute as my understanding grows. Speaking of that, 4) go-i2p
+(04:15:41 PM) eyedeekay: I've written a cursory proposal for go-i2p in the proposal branch on gitlab.
+(04:15:41 PM) eyedeekay: Besides that, I've nearly completed migrating the common structures from the old distro off of using byte-slice representation to using objects(structs) for representation, and re-written the tests to accomodate this change
+(04:16:07 PM) eyedeekay: That means I'm at the point where I'm writing new code instead of just updating what's there, which is pretty exciting
+(04:16:29 PM) eyedeekay: No transport yet, but that will be the next thing on the roadmap
+(04:16:35 PM) eyedeekay: EOT
+(04:16:41 PM) zzz: are you still over in a separate branch and if so why haven't you merged back?
+(04:17:39 PM) eyedeekay: I've got ~4 tests to finish up before I do
+(04:18:30 PM) eyedeekay: Once all the existing tests pass again or I can be sure they are redundant I'll merge it back
+(04:18:34 PM) zzz: ok. and where are we with the full-go vs. go wrapper around i2pd? If the latter is really only 2 hours of work, as orignal claimed, shouldn't that be the next step?
+(04:18:55 PM) zzz: as a proof of concept, or MVP, or to judge demand from go projects
+(04:19:22 PM) zzz: then you could later just swap it out with the go router via the same API
+(04:20:53 PM) eyedeekay: I've got it started but I'm having some issues figuring out exactly how to create the C wrapper for api.h, probably just because the process is new to me
+(04:22:34 PM) zzz: ok. I still don't understand if the i2pd wrapper is a) an alternative to be evaluated; b) something definitely to be done first but we're doing both; c) low-priority/TBD
+(04:22:53 PM) zzz: or d) we've rejected it
+(04:24:04 PM) eyedeekay: IMO it should be b), because I should learn how to write a C wrapper for C++ code, and because the ability to easily embed i2pd in anything that SWIG supports would be very useful to have in general
+(04:25:18 PM) zzz: ok you have an estimated date for that?
+(04:27:52 PM) eyedeekay: Orignal's right, it's 2 hours of work for someone who knows how to do it already. The hard part to guess is how long I have to read examples to know what I'm doing. The 15th seems safe.
+(04:28:14 PM) zzz: thanks, EOT
+(04:28:40 PM) eyedeekay: OK that's everything I have for it too
+(04:28:41 PM) eyedeekay: 5) reproducible build status
+(04:28:57 PM) eyedeekay: zlatinb this one is yours
+(04:29:21 PM) zlatinb: So, there's something that is reproducible on Mac and Linux with English locale and JDK 11 and sort of works
+(04:29:44 PM) zlatinb: I know how to fix it for all Locales and to build on Windows too, there are a few small tweaks necessary for that
+(04:30:31 PM) zlatinb: Despite it's PoC status I think we should have a web page with instructions for others interested in trying it out
+(04:31:04 PM) zlatinb: as it uses the gradle build system it doesn't add to the release load and I'm happy to own it
+(04:31:35 PM) zlatinb: that's about it
+(04:31:38 PM) zzz: I said this on my forum already but I think it's important. We already have reproducible builds for Debian/Ubuntu. This is for gradle, which is not a supported build product now
+(04:32:13 PM) zzz: I question the value of it, and the ability to support it when we're lacking all the repro. build infrastructure of debian
+(04:33:05 PM) zzz: and announcements that 'i2p is now reproducible' is misleading/wrong. we need to be very clear about what it is
+(04:35:01 PM) zzz: I don't think our testing is sufficient to claim reproucibility, and we don't publish our tool versions anyway.
+(04:35:34 PM) zzz: eot
+(04:37:23 PM) zlatinb: The only tool that matters is the JDK, and that is published to be 11.  I am very skeptical that our Debian/Ubuntu builds are truly reproducible, and doubt that anyone will be able to reproduce the .deb packages on their own.  Just because it passes the build bot doesn't mean it's reproducible, but that's another point.
+(04:37:55 PM) zlatinb: There is value added to certain class of users even from an incomplete PoC that "strives" towards reproducibility or however we want to word it.
+(04:38:38 PM) zlatinb: If nothing else it shows that we're aware that there is demand and are making effort (albeight low priority) to address that demand
+(04:38:43 PM) zzz: the build bot has a lot of tests in it, more than we're testing, including changing username, PWD, locale, time, timezone
+(04:39:02 PM) psi: doesn't debian have a bunch of hooks and shims that normalize timestamps and directories?
+(04:39:08 PM) zlatinb: but it's clearly not changing the timestamps of the checked out code, otherwise it would break right away
+(04:39:14 PM) psi: (for deterministic builds, also hi)
+(04:39:25 PM) zzz: there may be 'demand' but not clear it's enough to justify the effort
+(04:40:01 PM) zzz: yes psi, that's the build infrastructure we rely on for our reproducible debian builds
+(04:40:08 PM) eyedeekay: I can confirm that zlatinb and I did not compare notes on what tools we were using, other than that we were on the same JDK, we certainly didn't compare individual libraries
+(04:40:21 PM) zlatinb: the effort falls on me, as I said I'm happy to own it, and most of the work is already done
+(04:40:31 PM) zzz: we have an answer now, 'use debian'
+(04:40:53 PM) zlatinb: no, the answer is "use the debian toolchain and build environment to build your .deb"
+(04:41:09 PM) zzz: I'm not convinced your testing is thorough enough to claim 'mostly done'
+(04:41:55 PM) zlatinb: There are no known issues remaining, and the unknown ones we'll bump into as more and more people use it
+(04:42:00 PM) zzz: and I'm not convinced we need another release product solely for those demanding non-debian reproducibility
+(04:43:06 PM) zzz: I don't think we want to rely on users to discover reproducibility issues. we need some testing harness or build bot to confirm it given various permutations listed above and others
+(04:43:13 PM) zlatinb: it doesn't need to be a release-quality product, I keep saying it is work-in-progress and will remain so for the foreseeable future.
+(04:44:00 PM) psi: is the purpose an end user ready package or is it to appase the intellecuals?
+(04:44:01 PM) zzz: in that case, no objections
+(04:44:30 PM) zlatinb: clearly to appease the intellectuals, 100%
+(04:45:22 PM) psi: gotcha, just catching up
+(04:46:15 PM) zlatinb: what's wrong with having the users help find reproducibility issues?
+(04:47:14 PM) zzz: 1) because most users won't actualy try to reproduce; but 2) if it's not an official release-quality product, nevermind
+(04:47:34 PM) eyedeekay: Moving right along to 6) update channels report / Mac bundle report
+(04:48:14 PM) eyedeekay: Unless we need to keep going on 5)?
+(04:48:37 PM) zzz: I'm done with 5)
+(04:48:51 PM) eyedeekay: OK, 6 then
+(04:49:24 PM) eyedeekay: zlatinb this is also your topic
+(04:50:20 PM) zlatinb: not much to report since the last meeting on the Mac bundle side of things; I've been dogfooding it a bit
+(04:51:15 PM) zlatinb: I will probably have time this month to look into update channels properly.  At least the part that will live in the mac-jpackage repo
+(04:51:30 PM) zlatinb: can also look into the changes required to i2p.i2p unless someone else wants to have a stab at those?
+(04:51:33 PM) zlatinb: eot
+(04:52:07 PM) zzz: I'm happy to do the other side, let's coordinate this week
+(04:52:30 PM) zlatinb: ok sounds good
+(04:52:52 PM) zlatinb: that's all from me on 6)
+(04:52:56 PM) zzz: I believe there's a few choices we have discussed but haven't fully decided on, but shouldn't be hard
+(04:52:57 PM) zzz: eot
+(04:53:08 PM) eyedeekay: 7) Next release number, deferred item from April 6 meeting
+(04:53:57 PM) eyedeekay: 1.0.0? 9.51.0? There were several choices in the thread
+(04:54:26 PM) zzz: yes. 2 months ago, I presented 0.9.50 vs. 1.0.0
+(04:54:44 PM) zzz: since then, I noted that bitcoin core is going from 0.22 to 23.0
+(04:54:54 PM) zzz: if a number is just a number, it can be anything
+(04:55:18 PM) zzz: 0.9.51, 1.0.0, 2.0, 9.51, 10.0. whatever we want
+(04:55:54 PM) zzz: if "1.0.0" brings up too much anxiety or implicit promise of perfection, we can avoid that by jumping right over it
+(04:56:15 PM) zzz: or, we can just keep doing 0.9.x forever, or until some particular goal we haven't agreed to yet.
+(04:56:18 PM) zzz: EOT. thoughts?
+(04:56:55 PM) eyedeekay: I think a number is a number as long as the one we choose is on top when standard tools sort it, and in light of that, 9.51 has some appeal.
+(04:57:52 PM) zlatinb: If we had a roadmap for installers I would put a nice round 1.0.0 after those are finished, but we don't have such a roadmap, so I'd rather avoid 1.0.0 altogether.  Other than that 0.9.51 or 9.51 are the same to me.
+(04:58:27 PM) zzz: don't necessarily need consensus today either, we have two more meetings before the next release
+(04:59:04 PM) zzz: could always do a reddit poll although that may be counterproductive
+(05:01:40 PM) zzz: let's discuss again next month eyedeekay 
+(05:01:41 PM) zzz: eot
+(05:02:15 PM) eyedeekay: I do agree with zlatinb, if we were to use "1.0.0" as PR to seek new users, improving the installers would probably make such an effort more successful. If we wanted to preserve the opportunity to do do a 1.0.0 when that is done then we'd need to do 0.9.51, eot
+(05:02:28 PM) eyedeekay: 8) 0.9.50 status / remaining release items
+(05:03:16 PM) eyedeekay: zzz added this, but there's at least two of these I should probably answer for, GPlay and F-Droid
+(05:04:27 PM) eyedeekay: There was a bit of a mess with GPlay during release time, I had to migrate us to an Android app bundle which requires me to generate a key and upload it to Google so that they could confirm I was the one uploading the app
+(05:05:16 PM) eyedeekay: I failed at this process the first time which required me to contact google support, which caused a delay in the Android releases
+(05:05:47 PM) eyedeekay: For reasons related to the release process, this also delayed F-Droid builds.
+(05:06:33 PM) eyedeekay: From now on, F-Droid will be an apk, and Google Play will be an .aab, and the release process for one will not depend on the other. EOT.
+(05:06:46 PM) eyedeekay: Anything to add zzz?
+(05:07:20 PM) zzz: debian is the big issue. anybody heard from mhatta? he completely missed .49, now we're waiting on 50
+(05:09:01 PM) eyedeekay: Not in quite a while unfortunately, I can reach out again
+(05:09:08 PM) zzz: as far as net status, about 35-45% of net updated, about 25% have rekeyed, very smooth, no major complaints
+(05:09:08 PM) zzz: please keep this item on the agenda for next month, since we're not done yet
+(05:09:08 PM) zzz: eot
+(05:09:34 PM) eyedeekay: Will do
+(05:09:47 PM) eyedeekay: Anything else for 8?
+(05:10:00 PM) eyedeekay: Or in general? timeout 1m
+(05:11:26 PM) eyedeekay: All right then, thanks for coming everybody, next meeting will be July 6

i2p2www/meetings/logs/300.rst

@@ -0,0 +1,12 @@
+I2P dev meeting, June 1, 2021 @ 20:00 UTC
+=========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb,
+psi

i2p2www/meetings/logs/301.log

@@ -0,0 +1,69 @@
+(04:01:20 PM) eyedeekay: Hi everyone, it's time for the monthly community meeting, but as I forgot to make the announcement I will not be surprised if no one is here. In case anyone else is here, I'm open to having the meeting now. If no one else is here, I'll announce a new one on zzz.i2p so we can re-schedule
+(04:01:37 PM) zzz: hi
+(04:01:47 PM) eyedeekay: Hi zzz
+(04:02:10 PM) eyedeekay: zlatinb, anybody else here?
+(04:03:39 PM) eyedeekay: Ok that's my bad. Well zzz, I've got a short 2-item agenda for us if you've got time:
+(04:03:39 PM) eyedeekay: 2) Next Version Number
+(04:03:39 PM) eyedeekay: 3) Jpackage Updates
+(04:03:39 PM) eyedeekay: But I was hoping to have zlatinb for 3)
+(04:04:06 PM) zzz: 4) remaining 0.9.50 release items
+(04:04:31 PM) eyedeekay: Ack
+(04:05:10 PM) eyedeekay: 2) Next version number
+(04:06:27 PM) eyedeekay: I'm less and less reluctant about 1.0.0 now
+(04:07:31 PM) eyedeekay: zlatinb had some ideas about where performance could be improved, and what we both agreed on was that we needed something more onboardable for 1.0.0, i.e. the jpackage things
+(04:08:05 PM) zzz: I think an arbitrary jump to something like 1.5.0 or 2.5.0 or 5.1 avoids the 1.0.0 angst
+(04:10:04 PM) mode (+v zlatinb) by ChanServ
+(04:11:37 PM) eyedeekay: 1.5.0 seems right somehow? or maybe 1.51
+(04:12:22 PM) zzz: small numbers seem better
+(04:12:48 PM) eyedeekay: Yeah you're right
+(04:13:36 PM) eyedeekay: 1.5.0 works for me if it works for you
+(04:15:13 PM) zzz: I'll put it in a post on my forum and see what the reaction is
+(04:15:30 PM) eyedeekay: Sounds good
+(04:16:05 PM) eyedeekay: 3) Jpackage Updates
+(04:17:24 PM) eyedeekay: On my end I've got a WIP jpackage+Windows Installer+Firefox profile bundle which should be self-updating as of this morning. It's still untested and a draft PR, I'm sure I'll find something broken about it tonight, but so far, so good
+(04:17:35 PM) mode (+v anonymousmaybe) by ChanServ
+(04:18:55 PM) eyedeekay: It works by starting the installer just before the router shuts down, sleeping until the router shuts down, then allowing the installer to re-start the router when it completes
+(04:19:25 PM) zlatinb: not much on my end, I'm still a little stuck on figuring out how to an end-to-end test that starts from checking news.xml, fetching the update.dmg, performing the update, restarting the router
+(04:19:41 PM) zlatinb: but the concept is the same as on windows
+(04:22:35 PM) zlatinb: just quite a bit of infrastructure to set up I guess
+(04:23:01 PM) eyedeekay: I don't have much else to add, except that I'm going to try to figure out how to test it against a test news server tonight, which should help figure out the infrastructure
+(04:24:13 PM) eyedeekay: 4) Remaining 0.9.50 release items
+(04:24:27 PM) eyedeekay: Oops, pasted that too soon
+(04:24:37 PM) eyedeekay: Anything else on 3)?
+(04:25:02 PM) eyedeekay: 4) Remaining 0.9.50 release items
+(04:25:10 PM) zzz: still no debian/ubuntu, who's in charge of bugging mhatta?
+(04:25:40 PM) eyedeekay: I've been bugging him as much as I can, opened a PR on bote to get his attention, not sure what's up there. No response
+(04:26:11 PM) eyedeekay: Maybe I'm just not looking in the right place anymore
+(04:26:25 PM) zzz: it's now been 7 months since he cut a release
+(04:27:40 PM) zzz: anyway, I believe that's the only remaining item
+(04:28:12 PM) eyedeekay: I heard Debian accepts anonymous maintainers if they have a portfolio and a GPG key now, I could reach out and apply? I hate to make myself even more of a bus factor, but at least I pretty much know how to go from i2p.i2p->deb
+(04:30:17 PM) zzz: the problem is that I think he has several changes he never upstreamed back to us, so those differences would have to be resolved
+(04:31:53 PM) eyedeekay: If he does then I think they'd have to be reflected in the debian/patches, maybe I can find a way
+(04:31:53 PM) zzz: thats all I got, put it on the list for next month
+(04:32:00 PM) eyedeekay: Will do
+(04:32:16 PM) zlatinb: for this item I want to ask about the streaming buffer overflow
+(04:32:43 PM) zlatinb: is that something we want addressed for the next release?
+(04:32:50 PM) zzz: huh?
+(04:32:57 PM) zlatinb: s/overflow/choke/
+(04:33:14 PM) zzz: what item?
+(04:33:23 PM) zlatinb: oh sorry, thought we were discussing 0.9.51
+(04:33:27 PM) zlatinb: nvm
+(04:33:32 PM) zzz: but no, not a pressing problem, more of a test issue, low priority
+(04:34:01 PM) zzz: we were discussing .50 debs
+(04:34:32 PM) eyedeekay: I've got time, if zzz's got time I'm happy to make that item 5)
+(04:34:44 PM) zlatinb: yes please
+(04:34:49 PM) eyedeekay: Go for it
+(04:35:11 PM) zlatinb: I think it happens in the live net on short tunnels, not 0 but 1-hop
+(04:35:41 PM) zlatinb: at least I've seen suspicious behavior in muwire when configured with 1-hop tunnels on both nodes
+(04:36:24 PM) eyedeekay: I have a bunch of 1-hop services, is there anything I can look for in the logs to help you confirm it?
+(04:37:12 PM) zlatinb: at this early stage it can be debugged in a testnet, logging is too verbose for a live server
+(04:37:58 PM) zlatinb: I would like to spend some time on that and if there is a problem and a fix for it aim to put it in the next release
+(04:39:21 PM) zzz: to answer your question, it's a known issue for many years, presumed very rare in live net, the impacts are transient and possibly unfixable... so it's worth investigating (and I asked for help doing that), but for those reasons I wouldn't put it as a must-fix for the next release
+(04:39:56 PM) zlatinb: I think the recent speed improvements have made it less rare
+(04:40:31 PM) zzz: sure. maybe, maybe not
+(04:41:17 PM) zlatinb: ok I'll investigate and see what comes out
+(04:41:35 PM) eyedeekay: It'll be interesting to see what you find
+(04:42:10 PM) eyedeekay: Anything else for the meeting?
+(04:43:09 PM) eyedeekay: All right then that's it for today
+(04:43:18 PM) eyedeekay: Thanks zlatinb and zzz for being and bearing with me, I'll post the logs shortly and make sure I get the announcement up on zzz.i2p this time
+(04:43:24 PM) eyedeekay: being *here

i2p2www/meetings/logs/301.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, July 6, 2021 @ 20:00 UTC
+=========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/302.log

@@ -0,0 +1,95 @@
+(04:00:31 PM) eyedeekay: 1) Hi 
+(04:00:31 PM) eyedeekay: 2) 0.9.51/1.5.0 
+(04:00:31 PM) eyedeekay: 3) Remaining 0.9.50 items 
+(04:00:31 PM) eyedeekay: 4) Streaming choke findings 
+(04:00:31 PM) eyedeekay: 5) Jpackage Updates 
+(04:00:52 PM) eyedeekay: Hi everybody, time for the Tuesday meeting, who else is here?
+(04:00:58 PM) zlatinb: hi
+(04:01:05 PM) zzz: yo
+(04:01:24 PM) eyedeekay: Cool let's get started
+(04:01:34 PM) eyedeekay: 2) 0.9.51/1.5.0
+(04:01:45 PM) eyedeekay: zzz posted on the forum about the numbering change
+(04:02:06 PM) Irc2PGuest39607: hi!
+(04:02:24 PM) eyedeekay: Hi IRC2PGuest39607
+(04:02:38 PM) zzz: yeah, we preliminary-decided on 1.5.0 last month, how does everybody feel about it a month later?
+(04:02:40 PM) mode (+v anonymousmaybe) by ChanServ
+(04:03:08 PM) eyedeekay: It looks like we didn't get any opninions on it, I'm still OK with 1.5.0 as the next release
+(04:03:45 PM) X: I like moving towards a 1.x.x
+(04:03:47 PM) zzz: me too. will take time to get used to, but it feels like a good idea
+(04:04:17 PM) zlatinb: questions: are the maven jars going to stay at api version?  are plugins going to be checked against api versions?
+(04:05:36 PM) zzz: my guess is no for both
+(04:06:06 PM) zlatinb: ok, as long as it's consistent
+(04:06:51 PM) zzz: think of the API version as the "network version". Anything visible to the user should be release version
+(04:07:30 PM) eyedeekay: That makes sense to me, and I know 1.5.0 will work with our maven releases
+(04:07:42 PM) zzz: idk, may I also give a quick status report here?
+(04:07:50 PM) eyedeekay: Yes go ahead
+(04:08:00 PM) mode (+v anonymousmaybe) by ChanServ
+(04:08:09 PM) zzz: everything is pretty much done for the next release. 10k lines of diff
+(04:08:28 PM) zzz: tag freeze aug 11, checkin deadline aug. 20, release week of aug. 23
+(04:08:31 PM) zzz: EOT
+(04:08:40 PM) eyedeekay: Thanks zzz
+(04:09:02 PM) eyedeekay: Are we ready for 3) Remaining 0.9.50 items?
+(04:09:52 PM) eyedeekay: Right now the remaining release items are the same as the remaining release items for last month, which are Debian package releases
+(04:10:53 PM) zzz: sad story, but at this point all we can do is encourage people to switch to the PPA
+(04:11:08 PM) eyedeekay: I've still not received a response from our maintainer so for current debian packages, the only options are deb.i2p2.de/no and the PPA
+(04:11:49 PM) eyedeekay: I'll go ahead and make it clear on the website that those are the recommended packages
+(04:12:07 PM) eyedeekay: 4) Streaming Choke Findings
+(04:12:55 PM) eyedeekay: This was zlatinb's topic, please share your findings when you are ready zlatinb
+(04:13:20 PM) zlatinb: Choking does happen on the live network, probably due to some miscalculation of receive buffer size (125 vs 128), probably due to ecies MTU changes, dunno
+(04:13:56 PM) zlatinb: I haven't looked into more detail other than to try doubling the receive buffer and verifying that choking no longer occurs
+(04:14:42 PM) zlatinb: in general there are other streaming angles I would like to look into more detail but that will be for the next release. 
+(04:14:45 PM) zlatinb: eot
+(04:14:54 PM) zlatinb: s/next/after next/
+(04:14:57 PM) eyedeekay: Interesting. Thanks for looking into that. Should I include this as a topic for next month as well?
+(04:15:10 PM) zzz: definitely a topic for further research, but I don't think it rises to the level of needing to be an agenda item
+(04:15:30 PM) eyedeekay: OK thanks
+(04:16:11 PM) eyedeekay: Last is 5) jpackage updates
+(04:16:16 PM) zzz: but lets make sure zlatinb agrees?
+(04:16:16 PM) zlatinb: i agree
+(04:16:48 PM) eyedeekay: Ack. I'll leave it off the next agenda then
+(04:17:50 PM) eyedeekay: jpackage updates: zlatinb and I both have been working on jpackage bundles, zab's is for Mac OSX and is a signed DMG based package, mine is for Windows and is an NSIS based EXE that works like the Firefox Profile Installer
+(04:18:30 PM) eyedeekay: We've both been working on getting them to be self-updating and stable, I had a look at zab's work last night and did some catching-up
+(04:19:57 PM) eyedeekay: We've been doing releases of the experimental bundles at the same time as the regular releases before, the 1.5.0 AIO bundle and DMG bundle should be self-updating by then
+(04:20:17 PM) zzz: AIO?
+(04:20:37 PM) eyedeekay: All-in-One, the Windows/jpackage/profile bundle
+(04:21:43 PM) eyedeekay: Anything to add from your side on this zlatinb?
+(04:22:12 PM) zlatinb: the dmg is done and tested, I'm happy to have it as a download option when 1.5.0 comes out
+(04:22:20 PM) zzz: let's be clear what the plan is. We're going to have both of these on the download page, roughly on the same schedule as the rest of the 1.5.0 release? And labeled as what? Alpha? Beta?
+(04:23:11 PM) zlatinb: I would prefer "Alternative download option" rather than an alpha/beta label
+(04:23:35 PM) zlatinb: dmg is definitely not alpha, beta might be ok
+(04:24:19 PM) zzz: I'd also like to have a clear understanding of how we're going to steer people to one or the other. e.g., if you want it to run as a service, don't use this one.
+(04:24:34 PM) zzz: don't need to figure it all out at this meeting but sometime before the release
+(04:25:22 PM) eyedeekay: We've got a separate page for them where we call them "Experimental" for now. I intend to consider the AIO EXE installer "experimental" for one more cycle. For adding it as an alternative download option for Windows users on the lang/download page I intend to label it as such
+(04:25:35 PM) zzz: zlatinb, if it's only been tested by one person so far, then I think we need baby steps and a beta label
+(04:26:05 PM) zlatinb: ok
+(04:26:17 PM) zzz: "alternative" doesn't mean anything, we need to steer people one way or another. Those instructions can change as we get more testing
+(04:27:23 PM) zzz: eyedeekay, last time I peeked at yours, which was a couple weeks ago, you had a long way to go, so you're going to have to hustle, and tell us when it's time to take a look
+(04:28:18 PM) zzz: there's also no particular reason to hit the Aug. 23 mark, or have the same schedule as the dmg, if it's not ready
+(04:28:48 PM) eyedeekay: Sure, I won't be pushing a new version out until I'm pretty sure it will work every single time
+(04:29:38 PM) eyedeekay: I checked in a lot last night after looking through zab's changes but I haven't done a new update test yet
+(04:30:42 PM) zzz: I've spent hours and hours helping zab, and 5 minutes skimming yours... maybe you're getting more help from him, or are just grabbing most of his code, but you need to holler when you're ready
+(04:31:57 PM) eyedeekay: I borrowed a chunk of zab's code and adapted it but otherwise I've just been figuring it out as I go
+(04:32:25 PM) eyedeekay: I'll update the gitlab merge thread shortly to explain where it's the same and where it differs though
+(04:32:49 PM) eyedeekay: *this evening
+(04:33:53 PM) zzz: this goes for anytime we add an "official" release product on our download page or anywhere. It's a big step to add something new and stand behind it, and I don't ever want to add something without a lot of thought, and full consensus
+(04:35:15 PM) eyedeekay: Agreed
+(04:35:43 PM) zzz: :)
+(04:36:40 PM) eyedeekay: I think that we should settle the remaining alpha/beta and download page issues to reach that consensus in one of the jpackage threads on zzz.i2p then
+(04:37:56 PM) eyedeekay: That's all I had on 5, which brings us to the end of the agenda unless anyone has anything to add?
+(04:38:29 PM) zlatinb: an item for next meeting or the one after that:
+(04:38:44 PM) zlatinb: changes to the news.xml generation workflow to accomodate dmg and exe bundles
+(04:39:07 PM) zlatinb: eot
+(04:39:16 PM) zzz: last thing on 5) is that you two and echelon must have an agreed plan for the news, yes.
+(04:40:12 PM) eyedeekay: I'll put it on the agenda for the next month announcement and get in touch with ech on my side
+(04:40:12 PM) eyedeekay: Last minute addition from me, I'll be at Def Con from late Thursday until Monday, spending a most of the time at the CryptoCurrency village, I'll be helping people figure out Bitcoin and Monero I2P integrations
+(04:40:43 PM) zzz: what that probably means in practice is zlatinb telling idk and echelon some of the preliminary decisions and going from there
+(04:40:53 PM) zzz: eot, sorry slow typing
+(04:41:30 PM) eyedeekay: That sounds like good place to start
+(04:41:51 PM) zzz: great, have fun, good luck. You have a guess on the best time for people to find you, or clues how to track you down?
+(04:43:36 PM) eyedeekay: Crypto Village table is probably the best place to look, I marked 1-3 every day on the form but it'll probably be a little before 1, a little after 3
+(04:44:29 PM) eyedeekay: I'll get myself an ActivityPub account so people can toot at me other times
+(04:44:44 PM) zzz: ok, haven't seen any PR yet, about time to spin up sadie on twitter, and/or some reddit and forum posts
+(04:45:16 PM) eyedeekay: Will do
+(04:46:22 PM) eyedeekay: Anything else for the meeting? timeout 1m
+(04:47:38 PM) eyedeekay: All right thanks everybody
+(04:48:31 PM) eyedeekay: See you around IRC, next month's meeting will be September 7

i2p2www/meetings/logs/302.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, August 3, 2021 @ 20:00 UTC
+===========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/303.log

@@ -0,0 +1,115 @@
+(04:02:11 PM) eyedeekay: Hi everyone, sorry for the short notice, welcome to the September 7th meeting
+(04:02:11 PM) eyedeekay: 1) Hi
+(04:02:11 PM) eyedeekay: 2) Remaining 0.9.50/1.5.0 items
+(04:02:11 PM) eyedeekay: 3) Debian Repository Changes
+(04:02:11 PM) eyedeekay: 4) Jpackage Distributions
+(04:02:11 PM) eyedeekay: 5) 1.6.0 plans
+(04:03:12 PM) zlatinb: hi
+(04:03:21 PM) eyedeekay: Hi zlatinb
+(04:04:21 PM) eyedeekay: OK we can just get started, if anybody else joins us mid meeting please chime in and let us know you're here
+(04:04:49 PM) zzz: hi
+(04:04:54 PM) eyedeekay: Hi zzz
+(04:05:03 PM) eyedeekay: I'll take 2) remaining 0.9.50 items and 1.5.0 items
+(04:05:41 PM) serempa: hi
+(04:05:55 PM) eyedeekay: Hi serempa, welcome to the community meeting
+(04:06:19 PM) serempa: oh lucky me :)
+(04:06:20 PM) eyedeekay: It's the usual story, our Debian upstream package maintained by mhatta is not up to date, at this point we recommend that you use the project debian repository, newly under my administration at http(s)://deb.i2p2.de
+(04:06:54 PM) eyedeekay: First Tuesday of every month, 8PM UTC, tell your friends :)
+(04:07:19 PM) serempa: hmm actually I'm using i2pd 
+(04:07:28 PM) zzz: looks like our f-droid and official f-droid still todo eyedeekay ?
+(04:07:41 PM) eyedeekay: Yes I was just coming to that
+(04:09:26 PM) eyedeekay: I am still getting the F-Droid repository updated, I have no control over when official F-Droid gets updated so the recommendation will be similar, our F-Droid will be updated before the official F-Droid repository is
+(04:10:23 PM) eyedeekay: So for up-to-date packages our self-hosted F-Droid is likely required
+(04:10:48 PM) zzz: I don't see anything else that's missing
+(04:11:42 PM) eyedeekay: Those are the only two release products remaining
+(04:12:35 PM) serempa: sorry to ask but any arm packages maintained by someone?
+(04:13:16 PM) zzz: we work on any platform that has java
+(04:13:20 PM) serempa: in rpi repos its 0.9.38-3.1
+(04:13:47 PM) eyedeekay: That's raspbian without adding deb.i2p2.de to the sources.list?
+(04:14:01 PM) eyedeekay: Just to be clear serempa?
+(04:14:05 PM) zzz: you can follow the instructions on geti2p.net/debian to use our repo serempa
+(04:14:21 PM) serempa: ooh gotcha sorry
+(04:14:23 PM) eyedeekay: Yes it should have up-to-date pi packages
+(04:14:37 PM) eyedeekay: Which brings us to 3) Debian repository changes
+(04:14:37 PM) eyedeekay: We had a DNS issue with the old http://deb.i2p2.no repository
+(04:15:43 PM) eyedeekay: The server we used to use for it is no longer being used for anything, it's been retired. From now on, deb.i2p2.de and deb.i2p2.no are available using both HTTP and HTTPS
+(04:16:40 PM) eyedeekay: Please let us know if you run into any issues using the new setup, which should have fewer issues overall
+(04:17:22 PM) eyedeekay: Anything to add on 3)?
+(04:18:07 PM) eyedeekay: 4) Jpackage Distributions
+(04:19:29 PM) eyedeekay: Zab had a successful jpackage release so far, at least, some people are using it
+(04:20:29 PM) eyedeekay: We've got a better idea of how to adapt the news server now so that the jpackages can retrieve news and updates for their distributions
+(04:20:45 PM) eyedeekay: I'm delaying my release until I am able to release a new version of I2P In Private Browsing which includes a few bugfixes and which will set the home page a and search engine
+(04:21:31 PM) eyedeekay: That should be about another week
+(04:21:49 PM) eyedeekay: Anything else on 4) zlatinb? zzz?
+(04:22:06 PM) zlatinb: oops wait
+(04:22:06 PM) zlatinb: lag lag
+(04:22:37 PM) eyedeekay: Not a problem, go ahead zlatinb
+(04:22:39 PM) zlatinb: yes, the mac dmg is getting ~25 downloads/day on average
+(04:22:44 PM) eyedeekay: Nice!
+(04:23:10 PM) zlatinb: the /en/download/mac page gets good traffic too.  A lot of people visit it after trying to download the .jar
+(04:23:50 PM) zzz: back sorry, computer issues
+(04:24:12 PM) eyedeekay: (04:22:39 PM) zlatinb: yes, the mac dmg is getting ~25 downloads/day on average
+(04:24:12 PM) eyedeekay: (04:22:44 PM) eyedeekay: Nice!
+(04:24:12 PM) eyedeekay: (04:23:10 PM) zlatinb: the /en/download/mac page gets good traffic too.  A lot of people visit it after trying to download the .jar
+(04:24:24 PM) eyedeekay: In case you need it^
+(04:25:09 PM) zzz: have you three resolved the news server URL issues yet?
+(04:25:39 PM) zlatinb: which doesn't work at all on recent Mac OS versions because notarization
+(04:25:39 PM) zlatinb: eot
+(04:25:39 PM) zlatinb_ is now known as zlatinb
+(04:25:47 PM) zlatinb: bad lag, sorry
+(04:27:00 PM) eyedeekay: Not yet, zlatinb when would be a good time for us to meet and talk about the remaining news URL issues? I have one or two questions for you about requirements for that, if we could meet this week that would be enough
+(04:27:42 PM) zlatinb: yes, I'm happy to do the python changes once we agree on how to handle things
+(04:27:56 PM) zlatinb: the big question is do we want separate news feeds for the different products or just different metadata
+(04:28:05 PM) zlatinb: we need to decide on that
+(04:29:45 PM) eyedeekay: Then I'd like to do a quick voice meeting for that sometime this week, we can schedule later, I'm not sure which pros and cons I care about yet
+(04:30:01 PM) zlatinb: sure
+(04:30:08 PM) eyedeekay: Sounds good
+(04:30:21 PM) eyedeekay: Anything else for 4)?
+(04:30:30 PM) zzz: you'll need a different feed the first time you do an in-between update, e.g. for java
+(04:31:17 PM) zzz: be sure to include echelon as he may have his own issues
+(04:32:19 PM) eyedeekay: In-between like from non-jpackage to jpackage? On my side that's "disabled" the NSIS installer won't over-write an IzPack installer if it finds one
+(04:33:01 PM) zzz: couldn't think of the right word. I mean an intermediate release, between the upstream releases, e.g. 1.5.1
+(04:33:10 PM) eyedeekay: Oh I see
+(04:33:20 PM) eyedeekay: That makes sense, thanks for pointing that out
+(04:33:50 PM) eyedeekay: I'll send out a group email so we're all looped in
+(04:34:12 PM) eyedeekay: And we'll definitely need those because of OpenJDK releases
+(04:34:34 PM) eyedeekay: So we definitely care
+(04:35:13 PM) eyedeekay: OK anything else for 4)?
+(04:36:21 PM) eyedeekay: That brings us to 5) 1.6.0 plans
+(04:37:45 PM) eyedeekay: We should probably just take a moment to write out our plans down, timeout 3min
+(04:38:23 PM) zzz: I've updated the roadmap on the website for 1.5.0 and 1.6.0 - eyedeekay please review and fixup your items
+(04:38:45 PM) zlatinb: I'm going to see if there is a quick fix for the SSU slowness that I've observed in the testnet.  If it's something simple like a delayed ack taking too long I think we can put it in 1.6.0
+(04:39:04 PM) zlatinb: if it turns out to be more complicated then it's not really worth it as we're working on replacement
+(04:39:40 PM) zzz: I don't have a lot on my list for 1.6.0... at this point my main priority is SSU2, which is very early days, I don't expect it to be completed before mid next year
+(04:39:52 PM) eyedeekay: Ack, zzz, I will do this evening
+(04:39:52 PM) eyedeekay: I brought copypasta, this is the list taped to my bookshelf:
+(04:39:52 PM) eyedeekay: Code/Packaging:
+(04:39:52 PM) eyedeekay: 1) Eliminate the class of "Unmanaged" plugins, make Fork-and-Exec plugins manageable.
+(04:39:52 PM) eyedeekay: 2) Add support for Client-Side of X-I2P-Location to HTTP Proxy
+(04:39:52 PM) eyedeekay: 3) Debianize the I2P Browser Profile
+(04:39:52 PM) eyedeekay: 4) Pluginize the I2P Browser Profile
+(04:39:52 PM) eyedeekay: 5) Move goSam and sam3 to i2pgit.org instead of Github
+(04:39:52 PM) eyedeekay: 6) Clean up sam-forwarder UDP tunnels and move to go-i2p namespace
+(04:39:52 PM) eyedeekay: 7) Finally fix and merge go-i2p changes upstream
+(04:39:52 PM) eyedeekay: Web/Documentation:
+(04:39:52 PM) eyedeekay: 1) Document "How to Use" I2P for Android Browsing, Mail, Bittorrent
+(04:39:52 PM) eyedeekay: 2) Split download page into managable chunks, redirect to page by OS
+(04:39:52 PM) eyedeekay: 3) Document Jpackage install processes on Web Site
+(04:39:52 PM) eyedeekay: Misc:
+(04:39:52 PM) eyedeekay: 1) Migrate i2p.keyring.i2p to i2pgit.org
+(04:39:52 PM) eyedeekay: 2) Pluginize my other apps(BRB, Railroad, reseed-tools)
+(04:39:52 PM) eyedeekay: 3) Go rewrite of News Server(newsxml-tools)
+(04:39:52 PM) eyedeekay: 4) Generic Go SU3 Signing tool
+(04:40:33 PM) zzz: eyedeekay, I need misc #1 this week please
+(04:40:47 PM) eyedeekay: Absolutely
+(04:40:54 PM) zzz: super, thx
+(04:41:10 PM) eyedeekay: No problem
+(04:42:03 PM) eyedeekay: Anything else on 5)?
+(04:43:21 PM) eyedeekay: Anything else for the meeting? Timeout 2m in case of lag
+(04:43:53 PM) zlatinb: hmm yes has anyone noticed terrible lag today?  I'm also having to try up to 10 times to push something to git.idk.i2p
+(04:46:39 PM) eyedeekay: I have noticed some inconsistent difficulties pushing to git.idk.i2p in the past week
+(04:48:07 PM) eyedeekay: Usually gone in a few minutes but requiring multiple retries
+(04:49:37 PM) eyedeekay: I have it configured for 6 tunnels and 2 backup tunnels using one hop right now
+(04:54:59 PM) eyedeekay: It isn't multihomed but I could make it so
+(04:55:08 PM) eyedeekay: If there's anything else for the meeting? timeout 1m
+(04:57:26 PM) eyedeekay: All right thanks for coming everyone, same time next month, I'll post the meeting minutes to the site shortly

i2p2www/meetings/logs/303.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, September 7, 2021 @ 20:00 UTC
+==============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/304.log

@@ -0,0 +1,74 @@
+(04:00:04 PM) eyedeekay: Hi everyone welcome to the community meeting
+(04:00:04 PM) eyedeekay: 1) Hi
+(04:00:04 PM) eyedeekay: 2) Remaining 0.9.50/1.5.0 items
+(04:00:04 PM) eyedeekay: 3) Jpackage Distributions
+(04:00:04 PM) eyedeekay: 4) 1.6.0 Development Status
+(04:00:15 PM) mode (-m ) by zzz
+(04:00:16 PM) eyedeekay: 1) Hi who is here today?
+(04:00:24 PM) zlatinb: hi
+(04:00:24 PM) zzz: here
+(04:00:48 PM) eyedeekay: Hi zzz, hi zlatinb
+(04:01:30 PM) eyedeekay: 2) Remaining 0.9.50/1.5.0 items
+(04:02:21 PM) eyedeekay: It's the same story here as last meeting, we currently cannot reach mhatta, and our debian main packages are therefore not updated
+(04:02:55 PM) eyedeekay: The official recommendation for installing I2P on Debian and Ubuntu will be changing in the next release to use our own .deb repository/PPA
+(04:03:26 PM) eyedeekay: We're also updating the instructions to reflect some recommendations which will make usage of our repository more secure
+(04:03:52 PM) eyedeekay: In the new setup, our .deb package signing keys will only be valid for our packages, instead of across all packages
+(04:04:04 PM) eyedeekay: Current deb/ubuntu users will not need to change anything
+(04:05:04 PM) eyedeekay: That's all I have for 2) anything from anyone else?
+(04:05:23 PM) T3s|4: eyedeekay:  ^all noted, and I am also present
+(04:06:21 PM) eyedeekay: Thanks T3s|4
+(04:06:21 PM) eyedeekay: Timeout 1m for 2)
+(04:07:36 PM) eyedeekay: OK 3) Jpackage Distributions
+(04:08:02 PM) zlatinb: I have two items for this topic, both not good
+(04:08:18 PM) eyedeekay: OK maybe you should start us off then
+(04:08:42 PM) zlatinb: 3.1 - the Mac DMG was not deployed properly to the sigterm.no mirror and I discovered it two weeks after release
+(04:09:11 PM) zlatinb: which is a major fail, we need to understand why it happened and how can we prevent it in future
+(04:09:30 PM) zlatinb: 3.2 - I just tried the windows AIO on a fresh windows 10 VM with just Firefox installed, and the .bat couldn't launch the I2P.exe
+(04:09:50 PM) zlatinb: launching I2P.exe manually worked fine, but something in the connection between the two failed
+(04:09:50 PM) zzz: what is AIO?
+(04:09:55 PM) eyedeekay: Easy-Install
+(04:09:56 PM) zlatinb: All-In-One
+(04:10:17 PM) zlatinb: EOT
+(04:11:42 PM) eyedeekay: The sigterm.no fail was partly my fault, I've resolved the issue there which had to do with the way I used to do mirror-syncing.
+(04:12:13 PM) eyedeekay: Re the Windows bundle, that should definitely not be the case, not good. I'll follow up with it on i2p.firefox as soon as the meeting is over, thanks for bringing it to my attention.
+(04:12:50 PM) zlatinb: ok, happy to help debug in any way
+(04:14:54 PM) eyedeekay: OK on my side I'm testing the changes to i2p.newsxml for us to do updates with, should be ready to review this week, there are some minor changes to the instructions for running the news server I'll need to go over with ech but we're already in communication about that
+(04:16:03 PM) zzz: 3.3 re: bundles for OSX, I recommend we advertise that they are untested on ARM Macs, that performance is unknown, and we should solicit testers
+(04:16:17 PM) eyedeekay: Yes agreed, I can make that change to the web site tonight
+(04:16:19 PM) zzz: and from that, decide when to start making ARM builds
+(04:17:17 PM) eyedeekay: Will do
+(04:17:20 PM) zzz: note that Java 17 in theory supports OSX ARm native, but I don't know if any of the openjdk-type sites have the JRE builds yet
+(04:18:26 PM) zzz: EOT, thx
+(04:18:38 PM) zlatinb: building for Mac aarch64 needs to happen on Mac aarch64 because jpackage
+(04:18:55 PM) zlatinb: so that means I need to get an ARM Mac at some point
+(04:19:12 PM) zlatinb: or someone else needs to get an Apple dev account
+(04:19:31 PM) zlatinb: eot
+(04:20:35 PM) eyedeekay: My Mac is also x86_64 unfortunately or I'd offer to do it
+(04:21:17 PM) eyedeekay: Anything else for 3)?
+(04:22:19 PM) eyedeekay: OK then 4) is 1.6.0 Development Status
+(04:25:17 PM) eyedeekay: zzz's been keeping us up to date with his developments and status here: http://zzz.i2p/topics/3170-1-6-0-release-summary           
+(04:25:20 PM) eyedeekay: 6 weeks in, approx. 7 weeks to go
+(04:25:40 PM) eyedeekay: One of my two big planned changes for the router console isn't likely to go in, X-I2P-Locations in the HTTP proxy
+(04:26:10 PM) eyedeekay: The other, managing fork-and-forget plugins are going to be ready this week
+(04:27:10 PM) eyedeekay: Work on SSU2 continues in #LS2
+(04:27:10 PM) eyedeekay: zlatinb and zzz have also been identifying and debugging performance issues in SSU1
+(04:27:26 PM) eyedeekay: Anything to add zzz, zlatinb
+(04:27:28 PM) eyedeekay: ?
+(04:28:07 PM) zzz: so far there's not a lot of big things in this release
+(04:28:21 PM) zzz: very small diff as of now
+(04:28:50 PM) zzz: let's get any other big changes in soon
+(04:29:36 PM) eyedeekay: I'm not letting anything big or drastic go past this weekend for me. If I can't get it done by Monday I'll stick to small stuff.
+(04:29:40 PM) zzz: should be on track for a late Nov. release
+(04:30:43 PM) zzz: eot
+(04:30:45 PM) zzz: oh, also awaiting a post-EOL Jetty 9.3.30 release with some CVE backports. They've tagged it but not posted the builds yet, that's typical for them
+(04:31:43 PM) eyedeekay: If they wait to long to post the builds would it require delaying the release?
+(04:32:37 PM) zzz: should only be a week or so. if for some reason they don't do it, we can just take their patches
+(04:33:02 PM) eyedeekay: OK, thanks for clarifying
+(04:33:35 PM) eyedeekay: Is there anything else for 4) and if not, is there anything anyone else would like to discuss while we're here?
+(04:35:03 PM) eyedeekay: Timeout 1m
+(04:35:04 PM) zzz: if anybody with a registered nick wants voice, let me know before I click the 'm' button. sorry for the inconvenience
+(04:37:10 PM) eyedeekay: OK everybody thanks for coming to the meeting
+(04:37:10 PM) eyedeekay: See you around IRC and at the meeting next month
+(04:37:20 PM) eyedeekay: I've got some website updates to make
+(04:37:59 PM) eyedeekay: Please note zzz's ^ statement about voice on the IRC server
+(04:40:00 PM) eyedeekay: Oh one other thing, I'm going to be out-of-town Thursday and Friday, I'll be working offline those days. Message idk_afk if I'm not online and I will see it by the evening

i2p2www/meetings/logs/304.rst

@@ -0,0 +1,12 @@
+I2P dev meeting, October 5, 2021 @ 20:00 UTC
+============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb,
+T3s|4

i2p2www/meetings/logs/305.log

@@ -0,0 +1,74 @@
+(04:00:16 PM) eyedeekay: Hi everybody, welcome to the November 2 Community Meeting
+(04:00:16 PM) eyedeekay: 1) Hi
+(04:00:16 PM) eyedeekay: 2) 1.6.0 Development Status / Upcoming Release
+(04:00:16 PM) eyedeekay: 3) mac/win jpackage beta status, user test reports, in-net 17.0.2 update status, plans for 1.6.0 update ?
+(04:00:35 PM) zzz: hi
+(04:00:38 PM) zlatinb: hi
+(04:00:55 PM) eyedeekay: Hi zzz, zlatinb
+(04:01:25 PM) eyedeekay: 2) 1.6.0 Development Status / Upcoming Release
+(04:02:25 PM) eyedeekay: Release thread is here: http://zzz.i2p/topics/3170-1-6-0-release-summary and we still haven't picked a date, I should have replied on that thread, do we want to do that here?
+(04:02:43 PM) zzz: yes please
+(04:03:18 PM) zzz: 3 weeks from now would be 13 weeks. +/- 1 week ok with me also
+(04:03:19 PM) eyedeekay: OK then in my case I am in favor of the week of the 29th, after US Thanksgiving
+(04:04:12 PM) zlatinb: I'm afk from my main workstation until early Dec, so can't build or sign jpackage installers.  But I can still give an OTP for the signtool as that's on my phone.
+(04:05:34 PM) zzz: ok, so tentatively the week of the 28th then? eche|off eche|on any objections?
+(04:07:30 PM) eyedeekay: Week of the 28th sounds good to me for now. 
+(04:08:34 PM) eyedeekay: Anything else for topic 2)?
+(04:08:45 PM) zzz: yeah, quick status
+(04:09:02 PM) zzz: looking like a fairly modest release as measured by amount of changes
+(04:09:27 PM) zzz: some SSU speedups are perhaps the headline
+(04:09:48 PM) zzz: zlatinb, if you have time to squeeze in the unit test deprecation fixes that would be good
+(04:09:52 PM) zzz: EOT
+(04:10:02 PM) eyedeekay: Thanks zzz
+(04:10:28 PM) zlatinb: yeah, no promises on the unit test :)
+(04:10:42 PM) eyedeekay: 3) mac/win jpackage beta status, user test reports, in-net 17.0.2 update status, plans for 1.6.0 update?
+(04:12:18 PM) zlatinb: I assume that is jdk 17.0.1, there's no 17.0.2 out yet afaik
+(04:12:21 PM) zzz: yeah I added that item just to give you two a chance to give the community an update
+(04:12:32 PM) eyedeekay: zlatinb and I discussed it a few days ago and evaluated the prospect of doing an OpenJDK 17 update for the jpackage installs
+(04:12:43 PM) zzz: ignore any typos :)
+(04:13:36 PM) Ryemantis__ is now known as Ryemantis_
+(04:14:08 PM) eyedeekay: Right now we're prepared to do in-network updates of the jpackage installs but we are going to wait for the main release to do our jpackage releases which will update to either 17.0.1 or 17.0.2
+(04:14:55 PM) zlatinb: 17.0.2 isn't due until mid-january, so we should definitely have a 1.6.0 jpackage release
+(04:15:32 PM) zlatinb: my view is that I would really like to do a dry-run of the in-network update process to shake out any insects, but that needs to happen in the next 7 days cause I'm afk afterwards
+(04:16:03 PM) zlatinb: to summarize, the following needs to happen:
+(04:16:12 PM) zzz: eyedeekay, that wasn't very clear... you're 'prepared' but you're not going to do it, you're going to wait?
+(04:16:28 PM) zlatinb: 1. update of the i2p.newsxml repo to produce entries.html per platform
+(04:16:50 PM) zlatinb: 2. Make sure idk and ech's news http servers can serve the new news.su3 files
+(04:17:17 PM) zlatinb: 3. branch i2p.i2p from the i2p-1.5.0 tag, bump CoreVersion/RouterVersion, tag i2p-1.5.1
+(04:17:27 PM) zlatinb: 4. build jpackage installers, sign/notarize as necessary
+(04:17:47 PM) zlatinb: 5. build new entries.html with new release.json
+(04:17:50 PM) zlatinb: 6. deploy
+(04:17:51 PM) zlatinb: eot
+(04:18:03 PM) zlatinb: so I don't know if that can happen in 7 days, but it would be very nice if it could
+(04:19:10 PM) eyedeekay: By prepared I mean the i2p.newsxml changes produce valid feeds that can be used to distribute in network updates and they work on my lighttpd news setup
+(04:20:00 PM) eyedeekay: I need to add platform-specific entries.html support, right now everybody gets all the news but a different torrent
+(04:20:38 PM) zzz: even bigger picture, since it's beta, is it going well, are you getting downloads and/or complaints?
+(04:21:16 PM) zlatinb: downloads - ~25/day for mac, ~100/day for windows according to matomo
+(04:21:44 PM) eyedeekay: No major complaints, there was an issue with detecting the path to the installed package depending on architecture and whether windows was installed which affects some fraction of the Windows users but *only* when the launcher is run from the installer
+(04:22:03 PM) eyedeekay: So after the installer is run the bug goes away, and it's fixed in the new version
+(04:22:11 PM) eyedeekay: Well, will be
+(04:22:15 PM) zzz: great
+(04:22:21 PM) eyedeekay: That's the thing zab reported last month
+(04:22:40 PM) eyedeekay: *installed or updated from an earlier edition
+(04:24:34 PM) Ryemantis_: Hi everyone. Just wanted to also quickly check in and apologize for being quite the last few weeks. October was a very busy month for me and also had a hardware failure mixed in. After this week I should have some time to get my workstation back together and continue work on Android I2P. Currently working on LiveData, Remote-starting I2P, and UPnP fix. Will also update on the forums once I am back at 
+(04:24:35 PM) Ryemantis_: it. Please let me know too if anything else needs more immediate attention.
+(04:25:04 PM) eyedeekay: Excellent to hear from you Ryemantis_ and welcome to the meeting
+(04:25:28 PM) eyedeekay: Thanks for the update on what you're working on, hardware failures and life happen to all of us
+(04:27:01 PM) eyedeekay: So back to 3) for a moment, for right now it's incumbent on me to add support for entries.html in data/platform/branch/entries.html instead of only in data/entries.html so we can have platform-specific newsfeeds
+(04:27:13 PM) Ryemantis_: Definitely appreciate the understanding and thank you all for you hard work
+(04:28:23 PM) eyedeekay: As opposed to one feed where everybody gets everybody's news
+(04:29:00 PM) eyedeekay: After that, we can start at step 3. in zlatinb's description
+(04:29:37 PM) eyedeekay: Anything for 3)?
+(04:30:20 PM) zlatinb: no I think that captures everything
+(04:30:46 PM) eyedeekay: Cool anything else for the meeting zzz zlatinb Ryemantis_ ?
+(04:31:04 PM) zzz: nope
+(04:31:30 PM) Ryemantis_: nope
+(04:31:49 PM) zlatinb: yeah quick one - next meeting is it on the 1st?
+(04:31:54 PM) ***zlatinb checks calendar
+(04:32:12 PM) eyedeekay: I think the 7th zlatinb
+(04:32:20 PM) zlatinb: ok nvm then
+(04:32:33 PM) eyedeekay: The first is a Wednesday by my calendar
+(04:33:28 PM) eyedeekay: Oh right that reminds me, DST. I've always scheduled the meetings on UTC, but does anyone want to adjust the time of the meeting for DST?
+(04:33:36 PM) zzz has changed the topic to: 1.5.0-4 | Tag freeze Wed. Nov. 17
+(04:35:30 PM) eyedeekay: I'll take that as a no then. Unless someone brings it up in a forum thread, meetings will continue to be scheduled at the same time UTC
+(04:36:05 PM) eyedeekay: Thanks everybody for coming to the meeting, I'll post the logs in a few minutes.

i2p2www/meetings/logs/305.rst

@@ -0,0 +1,12 @@
+I2P dev meeting, November 2, 2021 @ 20:00 UTC
+=============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb,
+Ryemantis_

i2p2www/meetings/logs/306.log

@@ -0,0 +1,75 @@
+(03:00:21 PM) eyedeekay: Hi everybody, welcome to the December 7 meeting
+(03:00:28 PM) eyedeekay: 1) Hi 
+(03:00:28 PM) eyedeekay: 2) 1.6.1 Release Status 
+(03:00:28 PM) eyedeekay: 3) jpackage Update Status 
+(03:00:28 PM) eyedeekay: 4) Monero Integrations 
+(03:00:28 PM) eyedeekay: 5) New SAM Library 
+(03:00:37 PM) zzz: hi
+(03:00:41 PM) zlatinb: hi
+(03:01:05 PM) eyedeekay: Hi zzz, hi zlatinb
+(03:01:12 PM) eyedeekay: Anybody else here today?
+(03:01:16 PM) mode (-m ) by zzz
+(03:01:31 PM) eyedeekay: 2) 1.6.1 release status
+(03:02:32 PM) eyedeekay: Release 1.6.1 is available, the torrent is live, as are Debian/Ubuntu/Launchpad, Maven, GPlay, and our F-Droid
+(03:03:10 PM) eyedeekay: F-Droid's repository is still out of date, one of my tasks this week is to get our app working with their auto-build system again
+(03:04:01 PM) eyedeekay: Debian's repositories, as far as we know, aren't going to recieve our updates at this time, people who are using Debian packages should switch to deb.i2p2.de or deb.i2p2.no
+(03:05:18 PM) eyedeekay: The DMG bundle built by zlatinb has also been updated to 1.6.1 and is available on the mirrors and as an update
+(03:06:01 PM) eyedeekay: The exe bundle built by me is going to be up today, I had planned to do it yesterday but got bogged down in Windows updates so I'll do it this evening.
+(03:06:40 PM) eyedeekay: According to stats.i2p about 20% of the network has updated
+(03:06:47 PM) eyedeekay: Anything to add zzz, zlatinb?
+(03:09:13 PM) eyedeekay: Hello?
+(03:11:26 PM) eyedeekay: OK I'm back
+(03:11:40 PM) eyedeekay: (03:06:40 PM) eyedeekay: According to stats.i2p about 20% of the network has updated
+(03:11:40 PM) eyedeekay: (03:06:47 PM) eyedeekay: Anything to add zzz, zlatinb?
+(03:11:50 PM) zzz: yes
+(03:12:05 PM) zzz: no sign of a biglybt update yet, hopefully that will come soon
+(03:12:10 PM) zzz: no user complaints yet
+(03:12:26 PM) zzz: echelon had trouble with a 1.6.1-2 dev build but we don't know why
+(03:13:03 PM) zzz: also, users of any i2p package version (current or older) may have a problem due to changing jetty9 dependencies
+(03:13:24 PM) zzz: if so, sudo apt install libservlet3.1-java manually
+(03:14:44 PM) zlatinb: re biglybt I heard from Parg earlier today regarding an unrelated matter so he is ok.
+(03:15:52 PM) zzz: may also affect bleeding-edge ubuntu jammy, not sure
+(03:15:52 PM) zzz: eot
+(03:16:12 PM) zlatinb: eot
+(03:16:22 PM) zzz: I mean debian/ubuntu package
+(03:16:22 PM) zzz: eot2
+(03:16:22 PM) zzz: this is on debian sid and maybe jammy only
+(03:16:22 PM) zzz: eot3
+(03:16:22 PM) zzz: will give him a few more days and then bug him
+(03:16:31 PM) eyedeekay: Thanks zzz, the package/dependency thing will probably bubble up on Reddit if it's a problem
+(03:16:58 PM) eyedeekay: I run sid on the day-to-day basis and haven't hit this one so far
+(03:17:01 PM) zzz: ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997213
+(03:18:40 PM) eyedeekay: 3) jpackage Update Status
+(03:19:36 PM) eyedeekay: Partly covered this one already, zlatinb's dmg packages are up on the mirrors and listed on the site
+(03:20:29 PM) eyedeekay: I had some updates I needed to do to my Windows laptop so didn't get the exe builds done last night, got it out for after the meeting
+(03:21:08 PM) eyedeekay: I've flipped my news server over to publish zlatinb's new packages
+(03:21:59 PM) eyedeekay: I haven't heard from any users so far
+(03:22:27 PM) zlatinb: The dmg jpackage is at this point well-streamlined.  We did an end-to-end test of the in-network update with 1.5.0->1.5.1 and that worked (but from the second try)
+(03:23:02 PM) zlatinb: 1 person has downloaded the torrent according to snark
+(03:23:27 PM) zlatinb: not much else to report on the mac jpackage, it basically works
+(03:23:28 PM) zlatinb: eot
+(03:24:04 PM) eyedeekay: Thanks zlatinb
+(03:24:41 PM) eyedeekay: 4) Monero Integrations
+(03:25:55 PM) eyedeekay: There was some renewed interest in getting Monero-over-I2P working automatically in the GUI wallets(like Feather in particular) over the thanksgiving holiday
+(03:26:38 PM) eyedeekay: We're doing some design mockups and analysis of the tradeoffs of different configurations over here:
+(03:26:39 PM) eyedeekay: https://github.com/monero-project/monero-gui/issues/2274
+(03:27:15 PM) eyedeekay: They're interested in adopting several things from us, including eventually our model for distributing software updates in-network
+(03:27:53 PM) eyedeekay: If anybody wants to participate in that discussion we're having it there mostly, and also on the Monero Matrix channel
+(03:28:06 PM) eyedeekay: Monero-Community
+(03:28:20 PM) eyedeekay: EOT
+(03:29:05 PM) eyedeekay: 5) New SAM library
+(03:29:14 PM) zzz: cool, I assume they've already looked at what bitcoin did for the low-level address protocols
+(03:29:17 PM) zzz: eot
+(03:30:31 PM) eyedeekay: Yes they have
+(03:31:24 PM) eyedeekay: The other cool thing that happened last week is the folks at diva.exchange have created a new SAM library for node.js/javascript in general
+(03:32:02 PM) eyedeekay: It's much more thoroughly and recently documented than the old one which is now unmaintained
+(03:32:07 PM) eyedeekay: Source is here: https://codeberg.org/diva.exchange/i2p-sam
+(03:32:23 PM) eyedeekay: NPM package is here https://www.npmjs.com/package/@diva.exchange/i2p-sam
+(03:33:00 PM) eyedeekay: Given how popular node is I'm giving it a bit of a signal boost, seems like everybody writes their webapps in node these days
+(03:33:15 PM) eyedeekay: eot
+(03:34:21 PM) eyedeekay: Anything else for the meeting?
+(03:35:13 PM) zlatinb: not from me
+(03:36:01 PM) eyedeekay: timeout 1,
+(03:36:04 PM) eyedeekay: 1m
+(03:37:03 PM) eyedeekay: OK then thanks zzz, zlatinb, next meeting will be Jan 4, 2022
+(03:37:03 PM) eyedeekay: I will post the logs shortly

i2p2www/meetings/logs/306.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, December 7, 2021 @ 20:00 UTC
+=============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/307.log

@@ -0,0 +1,104 @@
+(03:00:39 PM) eyedeekay: Hi everyone and welcome to the January 4, 2022 meeting
+(03:00:39 PM) eyedeekay: 1. Hi
+(03:00:39 PM) eyedeekay: 2. Meeh services/Outproxy requirements http://zzz.i2p/topics/3218-meeh-services-going-down-soon
+(03:00:39 PM) eyedeekay: 3. Promoting Mac DMG JPackage to stable https://geti2p.net/en/download/mac
+(03:00:39 PM) eyedeekay: 4. NetDB research (Sim/Model) http://zzz.i2p/topics/3227-netdb-simulator-proposal
+(03:01:13 PM) zlatinb: hi
+(03:01:23 PM) zzz: hello
+(03:01:55 PM) eyedeekay: Hi zzz, zlatinb, anybody else here today?
+(03:02:20 PM) eyedeekay: Outproxy operators?
+(03:02:59 PM) eyedeekay: OK then on to 1, they can chime in if they want :)
+(03:03:38 PM) eyedeekay: So we're losing all of meeh's non-static services, for us that's mostly trac, which we've already replaced, and false.i2p, the default outproxy
+(03:04:07 PM) eyedeekay: Neither have worked well for a long time, but not having an outproxy tends to have a bad UX so we need to replace it
+(03:04:59 PM) eyedeekay: We discussed some options last week, one of which was  finding a new volunteer-run outproxy to make it the default.
+(03:06:30 PM) eyedeekay: If that is to happen, then we'll need it to meet some basic requirements. Obviously a privacy policy is important.
+(03:06:30 PM) eyedeekay: If they aren't passing everything to Tor directly, we'll also need a description of what filtering, if any, occurs
+(03:07:34 PM) eyedeekay: Other options are to run one ourselves, which is of limited appeal at best, another is local SOCKS support, which requires a local SOCKS proxy to be available.
+(03:08:07 PM) eyedeekay: If anyone wants to volunteer to be an outproxy, the place to reach out is at zzz's forum
+(03:09:05 PM) zzz: right
+(03:09:12 PM) eyedeekay: I have not been able to get statistics about false.i2p usage from meeh yet. EOT
+(03:09:40 PM) zzz: first of all we want to be very careful not to publicly recommend an alternate or set a new default without approval, as that might impose a large burden, financial or otherwise
+(03:10:06 PM) zzz: as a tiny baby step, we're looking to get alternates registered on stats.i2p and get approval to add them to our default hosts.txt
+(03:10:16 PM) zzz: as that at least makes it easier for people to configure and use them
+(03:10:55 PM) zzz: we have approval for that step for two outproxies, however only one is currently registered on stats.i2p
+(03:11:05 PM) zzz: so I'm awaiting for that second registration
+(03:11:05 PM) zzz: eot
+(03:11:35 PM) eyedeekay: Thanks zzz, I'll remind him btw
+(03:11:47 PM) dr|z3d: I've had some preliminary discussions with you, zzz, and on that basis I think it should be fairly clear that I'm not interested in offering an official service. Informal is fine, but nothing official.
+(03:12:52 PM) zzz: thanks for making it clear, and also thanks for your time and expertise in thoes discussions
+(03:12:59 PM) dr|z3d: I'm also of the view that a single outproxy is doomed to failure the moment it becomes official.
+(03:14:13 PM) eyedeekay: Certainly can see why that would be the case. Anything else on 1?
+(03:14:28 PM) zzz: perhaps. it certainly requires adequate capacity and competent administration
+(03:14:29 PM) zzz: eot
+(03:14:59 PM) eyedeekay: 3. Promoting Mac DMG Jpackage to stable
+(03:15:15 PM) eyedeekay: s/1/2/
+(03:15:42 PM) eyedeekay: So this topic was added by zlatinb, take it away
+(03:16:21 PM) zlatinb: thanks.  Basically, the non-DMG (jar) package is not notarized and the last 2 (or 3?) versions of Mac OS refuse to execute it unless the user changes some advanced settings
+(03:16:52 PM) zlatinb: at the same time, the DMG jpackage has been very stable and in-net updates have been tested end-to-end
+(03:17:10 PM) zlatinb: so I propose we make it the default mac download and get rid of the .jar option altogether
+(03:17:55 PM) zlatinb: since we already have a nice /mac page dedicated to the package, I suggest we keep that, removing the BETA modifier
+(03:18:14 PM) zlatinb: and on the Mac div in /download, just have a link to the /mac page, nothing else
+(03:18:19 PM) zlatinb: eot
+(03:19:22 PM) eyedeekay: I support it.
+(03:20:42 PM) eyedeekay: Do we need to wait for release or just do it now?
+(03:21:51 PM) anonymousmaybe is now known as Irc2PGuest95343
+(03:22:35 PM) mode (+ao zzz zzz) by ChanServ
+(03:22:37 PM) zlatinb: no need to wait for a release
+(03:22:54 PM) zzz: did you see my 3 questions before I dropped?
+(03:23:01 PM) eyedeekay: No I missed them
+(03:23:03 PM) zlatinb: no, sorry, pls repost
+(03:23:11 PM) zzz: I'll ask a few easy questions:
+(03:23:15 PM) zzz: 1) The user base is sufficient that we are confident it's been well-tested?
+(03:23:17 PM) zzz: 2) The release process is documented and in theory somebody else could build it if they had the right keys?
+(03:23:20 PM) zzz: 3) We're confident we have the resources to continue maintaining it and doing releases?
+(03:23:23 PM) zzz: eot
+(03:24:08 PM) zlatinb: 1) - according to matomo it gets 20-25 downloads a day.  We've had users of M1 Macs report that it works as expected.  No negative reports at all
+(03:24:28 PM) eyedeekay: 2) and 3) IMO the answers are definitely yes. I can build everything up to the notary part and can teach someone else to
+(03:24:53 PM) zlatinb: 2) is yes but requires de-anoning because Apple Inc.
+(03:24:54 PM) eyedeekay: So with zlatinb and I there are at least 2 people who know how to build it
+(03:25:08 PM) zzz: 2) but it is _documented_ ?
+(03:25:33 PM) zlatinb: yes, step by step incl. the notary process in the README.md
+(03:25:41 PM) zzz: super
+(03:26:16 PM) zzz: 1) does "working" include the update process? have we seen the torrent swarm actually fire off when the news updates?
+(03:26:29 PM) zlatinb: http://git.idk.i2p/i2p-hackers/i2p-jpackage-mac
+(03:26:43 PM) zzz: (because I think the windows version hasn't actually been seen to work yet)
+(03:27:26 PM) zlatinb: 1) yes, the swarm picks up, it's quite small but it's there.  I've seen it both at the 1.5.1 and 1.6.1 releases
+(03:27:49 PM) zzz: ok great, thanks for the answers, no objections
+(03:28:14 PM) eyedeekay: Cool I'll make the site changes tonight after I post the meeting logs
+(03:28:26 PM) zlatinb: awesome thanks!
+(03:29:05 PM) eyedeekay: Re: Windows, yes but appears it's an issue in the config file I shipped and not the updater itself
+(03:29:05 PM) eyedeekay: So Windows needs 1 more manual update to work with automatic updates, which I think I might have known ahead of time but forgot
+(03:30:07 PM) eyedeekay: 4. NetDB research (Sim/Model) http://zzz.i2p/topics/3227-netdb-simulator-proposal
+(03:30:44 PM) eyedeekay: Also zlatinb's topic, let us know what you're thinking
+(03:31:28 PM) zlatinb: So, in the last two weeks or so there has been a noticeable deterioration in the accessibility of sites like zzz.i2p, postman, event major.acetone.i2p... basically sites I know are up
+(03:31:57 PM) zlatinb: I've done some debugging and had situations where the LS of zzz.i2p gets fetched fine, but then the RI of the IBGW must be failing to fetch
+(03:32:03 PM) zlatinb: (I'm speculating here ofc)
+(03:32:47 PM) zlatinb: in a nutshell, there are many unknowns in the functioning of the NetDB and we have to place our faith in the Kad algorithm, which is fine, but I would rather have more confidence via some research
+(03:33:33 PM) zlatinb: just like the testnet helped improve the streaming and ssu and ntcp code a lot, I believe a model or a sim can help improve the functioning of the netDB
+(03:34:44 PM) zlatinb: and the reason I want to discuss it here is that if we go with a sim that runs the actual code that will be in the router, some refactoring will be necessary of the NetDB code, possibly some of the *Job classses too
+(03:34:52 PM) zlatinb: Note, I haven't looked into the multi-router jvm and JVMCommSystem yet
+(03:35:03 PM) zlatinb: maybe those can be an answer up to a given number of nodes
+(03:35:37 PM) zlatinb: but my goal is to simulate at least a few thousand nodes, which means abstracting away most of the router components
+(03:35:42 PM) zlatinb: eot-checkpoint
+(03:36:28 PM) major left the room (quit: Ping timeout: 320 seconds).
+(03:36:32 PM) zzz: I'm lukewarm at best, due to how hard it would be, and how long before we got any useful results
+(03:37:20 PM) zzz: for starters, I made a series of changes recently to make things more reliable
+(03:37:27 PM) zzz: in 1.6.1-6 dev build
+(03:37:46 PM) zzz: but I don't know if any of the popular servers (besides mine) are running it
+(03:38:17 PM) zzz: I would like to see echelon's and eyedeekay's servers try it. Those are two batches that I've had trouble with for months
+(03:38:20 PM) zzz: eot
+(03:38:44 PM) eyedeekay: Most of my servers just track the PPA, I'll get git.idk.i2p updated
+(03:39:17 PM) zzz: git and gitssh are two that frequently shun me. If they get better, I'll notice
+(03:40:07 PM) zzz: echelon's servers are another mystery. they seem to have IP-level issues frequently
+(03:42:11 PM) eyedeekay: I can do that soon then
+(03:43:37 PM) eyedeekay: My questions about the netDB test harness are probably ill-conceived, for instance, does the existing testnet have the ability to simulate a netDB between the routers within it?
+(03:44:08 PM) eyedeekay: And if so, is there a way to use it?
+(03:44:44 PM) The account has disconnected and you are no longer in this chat. You will automatically rejoin the chat when the account reconnects.
+(03:49:14 PM) The topic for #i2p-dev is: 1.6.1-7 | next dev meeting 8 PM UTC Tuesday, January 4, 2022
+(03:49:14 PM) Topic for #i2p-dev set by zzz at 09:08:14 AM on 01/03/2022
+(03:49:20 PM) zzz: gosh no not pspice. it was some sort of queueing/behavioral network model
+(03:50:31 PM) zzz: EOT and out, gotta run, thanks everybody
+(03:50:46 PM) eyedeekay: Later zzz
+(03:51:41 PM) eyedeekay: Anything else on 4? zlatinb
+(03:51:50 PM) zlatinb: no, that's all
+(03:52:08 PM) eyedeekay: All right that covers it for the meeting then, have a good week everybody

i2p2www/meetings/logs/307.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, January 4, 2022 @ 20:00 UTC
+=============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/308.log

@@ -0,0 +1,72 @@
+(03:01:32 PM) eyedeekay: Hi everyone welcome to the Feburary 8th dev meeting
+(03:01:38 PM) eyedeekay: Sorry about last week, hopefully the message dropping issues will not recur
+(03:01:45 PM) eyedeekay: Topics:
+(03:01:45 PM) eyedeekay: 1. Hi
+(03:01:45 PM) eyedeekay: 2. Outproxy Requirements(ongoing)
+(03:01:45 PM) eyedeekay: 3. 1.7.0/0.9.53 status / release schedule
+(03:02:13 PM) zzz: hi
+(03:02:15 PM) mode (-m ) by zzz
+(03:02:16 PM) zlatinb: hi
+(03:02:30 PM) eyedeekay: hi everybody
+(03:02:54 PM) eyedeekay: Let's start right in 2) Outproxy requirements
+(03:04:08 PM) eyedeekay: zzz found us a bunch of old lists of requirements, which we should either A) choose one or B) collate into a new list
+(03:04:51 PM) eyedeekay: I've been trying to do some research into which requirements are feasible and get some guidance from what Tor does
+(03:06:18 PM) eyedeekay: At the same time, some groups and some individuals have emerged to volunteer to help with outproxies, one of which is also a multiple Tor exit node operator operating a non-profit, so hopefully we can benefit from their experience
+(03:08:04 PM) eyedeekay: In some cases I find the rules a little murky:  - Optional allowlist/blocklist of hosts/IPs? for instance, seems straightforward at once but what we suggest blocking/allowing on a host/IP basis might open operators up to request to block things they don't want to block?
+(03:08:45 PM) eyedeekay: Seems like the advice may have been that it's safe to block "ports" but maybe not hostnames?
+(03:09:05 PM) zzz: I think there's two categories of requirements
+(03:09:57 PM) zzz: 1) Things that we as a project would want to see (header requirements, small error page, link to additional info)
+(03:10:48 PM) zzz: 2) Things that any rational outproxy operator would want, especially admin tools, but we don't have the expertise to offer much guidance
+(03:11:40 PM) zzz: we should focus on 1)
+(03:12:14 PM) eyedeekay: OK that's easier, approaching it from the other direction was like cramming for a test
+(03:12:40 PM) zzz: and we should not attempt to offer a turnkey packaged solution for 2), only perhaps suggest some best practices
+(03:13:00 PM) eyedeekay: But I think it implies we'll need to be flexible, i.e. things we want will need to be subordinate to the things they'll be able to offer
+(03:13:09 PM) eyedeekay: That's probably a given though
+(03:13:43 PM) zzz: I'm thinking everything in 1) is pretty basic
+(03:14:38 PM) zzz: 1a) filter out any X-I2P headers outbound. Do or don't add an X-forwarded headers in either direction?
+(03:14:54 PM) zzz: 1b) have a small error page with a link to more info
+(03:15:07 PM) zzz: 1c) have a privacy policy on the more info page
+(03:15:13 PM) zzz: stuff like that
+(03:16:24 PM) eyedeekay: Yeah I agree, that shouldn't be difficult
+(03:17:14 PM) eyedeekay: So I'll avoid trying to figure out what people "should" do re: category 2) for the time being and focus on 1)
+(03:18:19 PM) eyedeekay: Anything else for topic 2)?
+(03:18:36 PM) zzz: The other thing in 1) is http vs. standard tunnel. I _think_ http is the right choice, and the choice affects the header issues
+(03:19:04 PM) zzz: eot for 2)
+(03:19:37 PM) eyedeekay: The standard tunnel doesn't add the X-I2P-* headers at all does it?
+(03:19:55 PM) zzz: no, it doesn't know about header
+(03:20:09 PM) zzz: *headers
+(03:20:39 PM) zzz: so the choice affects what the external proxy software "sees"
+(03:21:47 PM) eyedeekay: So why http? Wouldn't it be better if the server software didn't have to strip/re-add/keep track of the X-I2P headers to keep them from leaking?
+(03:22:23 PM) zzz: any proxy needs to deal with headers
+(03:22:49 PM) zzz: the proxy standard specifies that some headers are "hop-by-hop" and need to be stripped/added
+(03:23:56 PM) zzz: and of course there's both the HTTP and HTTPS (CONNECT) cases to deal with
+(03:27:13 PM) eyedeekay: So in the HTTP tunnel case we would be actually using the X-I2P headers
+(03:28:39 PM) zzz: they could be used e.g. for rate limiting by a competent outproxy admin
+(03:29:09 PM) eyedeekay: Makes sense
+(03:29:57 PM) eyedeekay: Anything else on 2)?
+(03:30:05 PM) zzz: no
+(03:30:12 PM) eyedeekay: 3. 1.7.0/0.9.53 status / release schedule
+(03:30:59 PM) eyedeekay: We're exactly 13 days from release on the 21st
+(03:31:10 PM) eyedeekay: Tags are freezing tomorrow
+(03:31:39 PM) zzz: yup, checkin deadline Fri. Feb. 18
+(03:32:26 PM) zzz: i2pd will be releasing on the 19th or 20th with a fix for the nasty SSU bug that's been causing network reliability issues the last couple of months
+(03:32:55 PM) zzz: our release will also have some related workarounds and improvements
+(03:33:09 PM) eyedeekay: Good to hear, that's been a rough ride for a lot of folks especially on mobile
+(03:33:20 PM) zzz: I'm hopeful that conditions will improve pretty rapidly once people start upgrading
+(03:34:10 PM) zzz: other than that, the cycle has been pretty smooth, things are quieting down
+(03:35:26 PM) zzz: we're at 14,000 lines of diff, pretty good size
+(03:36:00 PM) zzz: eot for 3)
+(03:37:45 PM) eyedeekay: I don't have much to add, I'll still be making tiny CSS changes for the next week or so to deal with some quirks on extra-small or extra-wide screens and some contrast issues in the dark theme, but other than that my time will be spent trying to review and test
+(03:37:55 PM) zlatinb: I would like to run some tests in the testnet after both i2p and i2pd freeze the code for the release.  I've documented them on the gitlab wiki.
+(03:38:05 PM) zlatinb: eyedeekay: what about end-to-end test for the windows aio?
+(03:38:58 PM) eyedeekay: I got one working yesterday, I had a couple issues to deal, one on the build-config side and one on the router.config side but they should both be gone now as long as I'm extra-careful with my release build
+(03:41:18 PM) eyedeekay: Turns out I had built the package without incrementing the router version number so even if a download happened(which would not have happened because the URL in router.config was wrong) it would not trigger an update
+(03:42:16 PM) eyedeekay: Both those issues are fixed now and I've set up to test the package after I get it built
+(03:42:49 PM) eyedeekay: So my updates were badly broken, but now they should be fixed, EOT
+(03:44:07 PM) eyedeekay: Anything else for the meeting? Questions, comments, concerns?
+(03:46:02 PM) zzz: aio == "bundle" or "easy install bundle". Let's not use "aio" as the name for it anywhere
+(03:46:27 PM) zzz: I always think async i/o
+(03:46:36 PM) zzz: nothing else for me
+(03:47:06 PM) eyedeekay: OK yeah AIO is ambiguous means different things to different people
+(03:47:28 PM) eyedeekay: I'll stick to Bundle or Easy-Install Bundle
+(03:48:01 PM) eyedeekay: All right thanks everybody for coming to the meeting, see you next month on the 5th, looks like

i2p2www/meetings/logs/308.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, February 8, 2022 @ 20:00 UTC
+=============================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/309.log

@@ -0,0 +1,83 @@
+(03:01:40 PM) eyedeekay: Hi everyone, welcome to the dev meeting
+(03:01:40 PM) eyedeekay: 1. Hi 
+(03:01:40 PM) eyedeekay: 2. Release Status (1.7.0 / 0.9.53)
+(03:02:10 PM) zlatinb: hi
+(03:02:12 PM) zzz: hello
+(03:02:39 PM) eyedeekay: Anything else to add to the agenda today before we start the release status?
+(03:03:01 PM) zlatinb: I have two small items that could fall into a "wishlist for 1.8.0" item
+(03:03:25 PM) eyedeekay: 3) 1.8.0 wishlist
+(03:04:24 PM) eyedeekay: 2. Release Status(1.7.0/0.9.53)
+(03:05:37 PM) eyedeekay: On my end I do have one remaining item, there is an issue with the .aab bundle build process where static resources that are included from the `i2p.i2p` build are deleted and from the final .aab
+(03:06:06 PM) eyedeekay: For the time being, GPlay is delayed, I'm working on it today and should be done soon.
+(03:07:53 PM) eyedeekay: F-Droid and Freestanding are both .apk's that use the old build process that isn't broken, so it still works.
+(03:07:53 PM) eyedeekay: Are there any other outstanding release processes to finish?
+(03:10:03 PM) eyedeekay: zzz anything to add to the release status topic from your end? I understand BiglyBT released their plugin today, is that correct?
+(03:10:22 PM) zzz: yes
+(03:10:48 PM) zzz: based on expl. build success stats, we've rapidly recovered from i2pd's regression in the last release
+(03:10:52 PM) zzz: http://stats.i2p/docs/buildsuccess.png
+(03:11:11 PM) zzz: and are now at a higher point than any time in the last few years iirc
+(03:12:11 PM) zzz: things should settle out in another week and we'll see where we are
+(03:12:13 PM) zzz: eot
+(03:12:21 PM) eyedeekay: That's really excellent news. Glad things are looking good so far.
+(03:12:32 PM) eyedeekay: Thanks zzz
+(03:12:50 PM) eyedeekay: 3. 1.8.0 wishlist
+(03:13:17 PM) eyedeekay: zlatinb take it away
+(03:13:44 PM) zlatinb: hi, 1) is speeding up initial exploratory build time and 2) JNA
+(03:14:05 PM) zlatinb: 1: I've been doing some analysis, 75% of the exploratory tunnels that do build do so in less than 500ms
+(03:14:29 PM) zlatinb: out of ~30 samples the slowest successful build was less than 2500ms
+(03:14:46 PM) zlatinb: whereas the timeout we have now is 13000 ms, I think reducing that will get the router to RUNNING state faster
+(03:15:07 PM) zlatinb: we don't have to decide now, just floating the idea out there
+(03:15:12 PM) zlatinb: eot on 1
+(03:15:33 PM) zzz: no objections on 1
+(03:15:56 PM) eyedeekay: Sounds like an interesting experiment to try at least, it doesn't seem like it could do any harm
+(03:16:12 PM) eyedeekay: If all the successful builds are so short
+(03:16:13 PM) zlatinb: 2: JNA - we'll definitely need to add JNA to the windows easy install bundle in order to elevate priviledge during auto-update.  ProcessBuilder fails if the process requires elevation.
+(03:16:20 PM) zzz: although I'd like to see data over a longer time period before we pick the new number
+(03:16:25 PM) zlatinb: sure
+(03:16:42 PM) zzz: please back up and define JNA
+(03:16:43 PM) zlatinb: (back to 1) I'll leave a router running with logging enabled
+(03:17:12 PM) zlatinb: (back to 2): JNA is Java Native A-something but it's basically a Java wrapper of native windows linux and mac libraries
+(03:17:27 PM) zlatinb: so instead of writing native code you write java code
+(03:17:52 PM) zlatinb: two jars combined size 3MB, compressed with LZMA down to 2MB
+(03:18:11 PM) zzz: please back up and elaborate on the problem and how prevalent it is
+(03:18:38 PM) zlatinb: while testing silent updates in muwire I saw that ProcessBuilder fails to launch an installer with an "priviledge elevation required" or some such
+(03:19:07 PM) zzz: windows-only problem?
+(03:19:12 PM) zlatinb: googling revealed that it is not possible to do so with ProcessBuilder
+(03:19:36 PM) zlatinb: yes windows-only for now
+(03:19:40 PM) eyedeekay: It doesn't seem to be happening on the Windows Easy-Install to me, is that because NSIS is asking for the elevated privileges and not Java?
+(03:20:02 PM) zlatinb: NSIS is asking
+(03:20:16 PM) zlatinb: if you already run the java with priviledge then it won't ask
+(03:20:22 PM) zlatinb: privilege*
+(03:20:28 PM) zzz: yeah that's my question, windows easy-install has been in beta for months and months, is this a muwire-only problem?
+(03:20:48 PM) eyedeekay: Oh OK, then it will start happening before the next update with ShellExecAsUser
+(03:21:15 PM) zlatinb: do you elevate if launched not from installer eyedeekay?
+(03:21:48 PM) zlatinb: I don't remember seeing an elevation prompt
+(03:22:12 PM) zlatinb: so it should be happening with windows easy-install if launched from desktop shortcut, not as a last step of an installer
+(03:22:14 PM) eyedeekay: No I don't, it runs as the user running the batch script, but only if I2P isn't already running, presumably as an admin
+(03:22:52 PM) zzz: so, before we can start talking about a solution for our easy-install windows bundle, let's verify there is a problem
+(03:22:57 PM) eyedeekay: It does not shut down the router with the browser
+(03:23:35 PM) eyedeekay: I'm inclined to believe that there will be, but will confirm later this week
+(03:23:36 PM) zlatinb: so if the user doesn't uncheck the "launch i2p now" checkbox and leave the router running, it will run as privileged and not prompt on update
+(03:23:43 PM) zlatinb: ok
+(03:24:22 PM) zlatinb: either way, with 1.7.0 the router is launched as non-privileged even if launched from the installer
+(03:24:39 PM) zzz: and while you can follow your own rules in muwire, any solution in our official products will have to be vetted for suitability, maintenance, license compatibility, etc
+(03:24:57 PM) zlatinb: Apache 2.0
+(03:25:45 PM) zlatinb: looking forward JNA allows us to do anything we like with windows APIs really.. register shell extensions, URI handlers, all that good stuff
+(03:25:57 PM) zlatinb: eot on 2
+(03:26:35 PM) zzz: let's get a couple cycles in on the easy-install auto-updater, which apparently has never worked?
+(03:27:13 PM) zzz: you don't have to wait for a i2p release, just put in a new java, or change something else. let's work out the bugs a little faster
+(03:27:14 PM) eyedeekay: It was broken, then fixed, now apparently it will break again on the next update
+(03:27:55 PM) eyedeekay: But the other solution from my side would be to change the installer so it no longer uses %ProgramFiles% and installs somewhere unprivileged
+(03:28:09 PM) zzz: do a release every week until it's working smoothly. obviously the 3-month pace isn't fast enough to converge on something that works
+(03:28:32 PM) eyedeekay: Can do
+(03:29:53 PM) eyedeekay: Thanks for bringing these up for us zlatinb, anything else on 3?
+(03:29:58 PM) zzz: and that will give us data on the extent of the privileges problem, if any
+(03:30:00 PM) zzz: eot
+(03:30:21 PM) zlatinb: no, eot from me
+(03:30:57 PM) eyedeekay: All right anything else for the meeting? timeout 1m
+(03:31:16 PM) zzz: also, use the news to tell your beta testers if the update is broken and they need to re-download
+(03:31:35 PM) eyedeekay: will do
+(03:32:05 PM) zzz: you both have your own news feeds, but aren't using it to talk to your users, you're just relying on my news entries? you should start testing/using that feature
+(03:32:11 PM) zzz: eot
+(03:34:07 PM) eyedeekay: Can do, in the past I added the i2p.firefox changelog
+(03:34:54 PM) eyedeekay: Thanks for coming to the meeting everybody, looks like I've got a lot of work to do, see you all around IRC

i2p2www/meetings/logs/309.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, March 1, 2022 @ 20:00 UTC
+==========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/310.log

@@ -0,0 +1,90 @@
+(04:00:32 PM) eyedeekay: Hi everyone welcome to the April dev meeting, agenda for today:
+(04:00:32 PM) eyedeekay: 1. Hi
+(04:00:32 PM) eyedeekay: 2. Release Status (1.7.0 / 0.9.53)
+(04:00:32 PM) eyedeekay: 3. Development Status (1.8.0 / 0.9.54)
+(04:00:32 PM) eyedeekay: 4. JNA in easy-install bundles, what doors does it open?
+(04:00:42 PM) eyedeekay: 1. Hi
+(04:00:47 PM) zlatinb: hi
+(04:00:50 PM) zzz: hi
+(04:01:18 PM) eyedeekay: Hi zlatinb, hi zzz
+(04:01:27 PM) eyedeekay: Anybody else here today?
+(04:01:45 PM) eyedeekay: 2. Release Status (1.7.0 / 0.9.53)
+(04:02:52 PM) eyedeekay: 1.7.0 has been out for about 6 weeks now, updates from last month for me are that all the Android packages are successfully deployed and the bug that was discovered at release time is now fixed
+(04:03:28 PM) eyedeekay: As usual, the packages in Debian's main repositories haven't seen an update, if you're still using them please switch to deb.i2p2.de/.no as soon as possible
+(04:04:23 PM) zzz: re: Debian, I did find a volunteer to get 0.9.48 fixed and reinstated into Sid. that's done
+(04:04:46 PM) zzz: whether it will automatically trickle back into bullseye and ubuntu, no idea
+(04:05:00 PM) zzz: still no luck finding a new maintainer
+(04:05:01 PM) zzz: eot
+(04:05:08 PM) eyedeekay: Thanks
+(04:05:51 PM) eyedeekay: I have one more, this overlaps 2 and 3 and 4 actually but Easy-install bundles for Windows will still require one more manual update
+(04:06:25 PM) zzz: have you made progress since last meeting?
+(04:06:30 PM) eyedeekay: Considerable yes
+(04:07:15 PM) eyedeekay: Most of it is part of this MR, : https://i2pgit.org/i2p-hackers/i2p.firefox/-/merge_requests/6/diffs#10d851887651eddb01e5952f08999080b019da2e
+(04:07:35 PM) zzz: great. you have a target date for when you will propose transition out of beta?
+(04:08:02 PM) eyedeekay: As soon as users receive an automatic update I will consider it ready
+(04:08:22 PM) zzz: thanks
+(04:08:47 PM) eyedeekay: Anything else on 2?
+(04:09:33 PM) eyedeekay: 3. Development Status (1.8.0 / 0.9.54)
+(04:10:03 PM) zzz: (no, all good, haven't heard any complaints on 1.7.0)
+(04:10:21 PM) eyedeekay: Me either, people seem to be pretty happy with it so far
+(04:12:12 PM) eyedeekay: As for 3. Development Status (1.8.0 / 0.9.54) Unfortunately I've been a lot slower at some things than I expected, I'm stuck on UDP tunnels but almost ready for an MR on SAM authentication
+(04:12:38 PM) eyedeekay: Besides that I'm doing some revisions to the complicated bandwidth wizard pages to make the selection process more understandable and the notifications more noticable
+(04:12:52 PM) eyedeekay: We're about 6 weeks in with 7 weeks to go, right zzz?
+(04:13:02 PM) zzz: right
+(04:13:31 PM) eyedeekay: Do you want to update us on SSU2 or anything else you've been working on?
+(04:13:46 PM) zzz: 13 weeks would be a May 23 release
+(04:13:53 PM) zzz: yes, thanks
+(04:14:01 PM) zzz: enormous progress with i2pd on SSU 2
+(04:14:03 PM) mode (+v anonymousmaybe) by ChanServ
+(04:14:17 PM) zzz: live testing happening in the network now
+(04:14:40 PM) zzz: other things coming in the release: snark standalone improvements, router family fixes
+(04:14:49 PM) zzz: an SSU 1 performance fix
+(04:15:15 PM) zzz: things should slow down soon on SSU 2, and I'll be turning to some more bug fixes all over
+(04:15:23 PM) zzz: eot
+(04:16:04 PM) eyedeekay: Awesome, thanks for the updates zzz
+(04:16:37 PM) eyedeekay: zlatinb anything you want to talk about for this topic before we get to 4?
+(04:16:55 PM) zlatinb: I guess the reduction in tunnel build timeout should result in faster bootup
+(04:17:11 PM) zlatinb: or faster 0-to-Router.isRunning()
+(04:17:20 PM) zlatinb: that's all eot
+(04:17:38 PM) eyedeekay: Thanks zlatinb, that will make people happy :)
+(04:17:56 PM) eyedeekay: 4. JNA in easy-install bundles, what doors does it open?
+(04:18:15 PM) eyedeekay: zlatinb this was your topic but I have a lot of notes on it too, do you want to start?
+(04:18:24 PM) zlatinb: sure.
+(04:18:34 PM) zlatinb: Basically MR 6 adds the JNA libraries to the windows easy-install bundle
+(04:18:49 PM) zlatinb: which just today I learned wasn't necessary because of JEP 419 (which is built-in JNA replacement)
+(04:19:12 PM) zlatinb: but the overall point is the same: since we need to do some native things, what other native things do we want to do?
+(04:19:33 PM) eyedeekay: Sometimes we need to talk to power/batter management
+(04:19:36 PM) eyedeekay: *battery
+(04:19:57 PM) zlatinb: In MuWire I've implemented a "background priority" on windows, which according to the MSDN docs guarantees the process never interferes with foreground processes
+(04:20:05 PM) zlatinb: yes, battery power management is another such thing
+(04:20:17 PM) eyedeekay: I need to ask for admin rights in a conditional way, which isn't supported by NSIS itself
+(04:20:21 PM) zlatinb: so yeah that's from me, just invitation to think native :)
+(04:20:21 PM) zlatinb: eot
+(04:21:22 PM) eyedeekay: So yeah we definitely have a few cases in mind where it might be useful to have something JNA-like
+(04:22:41 PM) zlatinb: ok.. then the question is do we add any/all such functionality in the easy-install bundle and keep it outside of the core router package
+(04:22:45 PM) zzz: sorry to be the party-pooper, but at last month's meeting, JNA was a possible solution to a single problem (privilege) on Windows only
+(04:23:08 PM) zzz: and today we're at "it's definitely the solution for many problems, what other fun stuff can we do with it" ?
+(04:23:18 PM) zlatinb: yeah that's the party theme lol
+(04:23:34 PM) zzz: which is both a leap and typical solution-looking-for-a-problem
+(04:24:31 PM) zlatinb: that's one way to look at it, I think it (JNA / JEP 419) can make I2P better in many ways
+(04:25:14 PM) zlatinb: on many platforms
+(04:25:14 PM) zlatinb: I've just scratched the surface on windows tbh
+(04:25:28 PM) zzz: so JNA has not been decided on?
+(04:25:28 PM) zlatinb: JNA has the benefit of being backwards compatible down to java 1.4, JEP 419 is only in JDK 18
+(04:25:51 PM) zlatinb: I would say both are on the table, with JNA having some headstart
+(04:26:37 PM) zzz: 419 is "incubator" status meaning it could vanish, don't count on it
+(04:27:07 PM) eyedeekay: I'm pro-JNA because being able to control installer privs solves at least 2 problems for me and gives me the power to install to/run entirely from flash drives
+(04:27:46 PM) eyedeekay: I don't want to lose that to a project being unready or abandoned
+(04:29:03 PM) eyedeekay: So I guess pro-JNA, hesitant on 419 from me
+(04:29:54 PM) zlatinb: well 419 with a slightly different api is already in JDK 17 which is LTS, but I won't have a strong opinion until it's out of incubation
+(04:30:00 PM) zzz: we should continue to keep an eye out for the best tools to solve the problems we have now... daydreaming what else we could do with it isn't so important
+(04:31:10 PM) zzz: going out of the JVM is always going to be messy and less maintainable, to be used only if really necessary, no matter what mechanism is used
+(04:33:14 PM) zlatinb: Nobody disagrees with that, but I think we shouldn't stop ourselves from dreaming big
+(04:33:38 PM) zlatinb: integrating with the windows shell or power management on laptops sounds awfully nice to me
+(04:34:18 PM) zlatinb: that should be possible on linux laptops as well btw
+(04:34:33 PM) eyedeekay: I'm still dreaming small TBH, flash-drive-portables were just a by-product of supporting adminless installs
+(04:36:24 PM) eyedeekay: But if there's a non-JNA way of doing something then yeah we should probably try that first
+(04:38:54 PM) eyedeekay: Anything else on 4?
+(04:39:07 PM) zlatinb: not from me, eot
+(04:40:26 PM) eyedeekay: Anything else for the meeting? timeout 1m
+(04:41:43 PM) eyedeekay: All right thanks everybody for coming, looks like next month meeting will be May 3rd

i2p2www/meetings/logs/310.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, April 5, 2022 @ 20:00 UTC
+==========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/311.log

@@ -0,0 +1,28 @@
+(03:48:58 PM) eyedeekay: It would seem not, I'll have a look at gitlab's bugtracker and see if I can find an explanation
+(04:00:03 PM) eyedeekay: Hi everyone, welcome to the development meeting
+(04:00:03 PM) eyedeekay: 1. Hi 
+(04:00:03 PM) eyedeekay: 2. Release Date
+(04:00:03 PM) eyedeekay: 3. Development Status (1.8.0 / 0.9.54)
+(04:00:05 PM) eyedeekay: hi
+(04:00:13 PM) zlatinb: hi
+(04:00:17 PM) zzz: hello
+(04:00:45 PM) eyedeekay: 2. Release date
+(04:01:16 PM) eyedeekay: We need to decide on one, tentatively it's been the 23rd for a while, that works for me if it works for everybody else?
+(04:01:43 PM) zzz: that would be 13 weeks, fine with me
+(04:02:01 PM) zzz: need approval from eche|off eche|on if he's here
+(04:03:04 PM) eyedeekay: looks like not but I can email him after the meeting
+(04:04:00 PM) eyedeekay: looking like the 23rd pending email to ech
+(04:04:09 PM) eyedeekay: Anything else for 2?
+(04:04:58 PM) eyedeekay: 3. Development Status (1.8.0 / 0.9.54)
+(04:07:41 PM) eyedeekay: We're definitely less than a month from releasing 1.8.0/0.9.54 in any case, with lots of it being preparation/implementation for SSU2 by zzz
+(04:08:42 PM) eyedeekay: Big changes should be done soon, and tag freeze is on the 11th so translations must be in by then
+(04:09:28 PM) eyedeekay: /translations/strings
+(04:09:58 PM) eyedeekay: zzz, zlatinb anything to add on this topic?
+(04:10:44 PM) zzz: not much, I'm pretty much done, will be chasing a few minor things on my list in the next couple weeks
+(04:11:02 PM) zlatinb: nothing from me
+(04:11:03 PM) zzz: any new ssu2 stuff I'll probably either hold off or stick in a branch
+(04:11:11 PM) zzz: eot
+(04:12:05 PM) eyedeekay: thanks guys
+(04:12:49 PM) eyedeekay: Anything else for the meeting? Last-minute topics? timeout 1m
+(04:14:13 PM) eyedeekay: All right, quick meeting today
+(04:14:33 PM) eyedeekay: Thanks everyone for coming, I'll email echelon then post the logs

i2p2www/meetings/logs/311.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, May 3, 2022 @ 20:00 UTC
+========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/meetings/logs/312.log

@@ -0,0 +1,60 @@
+(04:00:41 PM) eyedeekay: Hi everybody and welcome to the June 7 meeting
+(04:00:41 PM) eyedeekay: 1. Hi 
+(04:00:41 PM) eyedeekay: 2. 1.8.0 release status 
+(04:00:41 PM) eyedeekay: 3. 1.9.0 development status
+(04:00:41 PM) eyedeekay: 4. MoneroKon 2022
+(04:01:23 PM) zzz: hi
+(04:01:27 PM) zlatinb: hi
+(04:01:52 PM) eyedeekay: Hi guys, anybody else here or any topics to add?
+(04:03:26 PM) eyedeekay: I'll get us started on 1.8.0 release status then
+(04:04:29 PM) eyedeekay: Maven and I2P Easy-Install bundle for Windows were released shortly after the main 1.8.0 release occurred without incident, the I2P Easy-Install bundle got it's first successful automatic update as well
+(04:05:12 PM) eyedeekay: The Android release was delayed by about 5 days because I had to change it to avoid asking for a new gated permission from google to release on gplay
+(04:05:37 PM) eyedeekay: zzz do you want to apprise us of the main release and debian and then zlatinb, OSX easy install bundle?
+(04:06:37 PM) zzz: two weeks since the release, all looks good, haven't heard any complaints
+(04:07:01 PM) zzz: about 25% of the network has updated. BiglyBT release should be out shortly, that will give us a big jump
+(04:07:01 PM) zzz: that's all I have unless anybody has questions
+(04:07:03 PM) mode (-m ) by zzz
+(04:07:07 PM) zlatinb: same here, only difference from earlier release is that the Mac bundle includes GPLv2+Classpath license
+(04:07:29 PM) eyedeekay: Thanks guys, anything else on this topic?
+(04:08:26 PM) eyedeekay: 3. 1.9.0 development status
+(04:11:01 PM) eyedeekay: 2 weeks from release we're also 2 weeks into 1.9.0, zzz has been hard at work on ssu2 with orignal, if he wants to give us an update on that
+(04:11:22 PM) zzz: thanks
+(04:11:31 PM) zzz: we're getting wider testing of SSU2
+(04:11:50 PM) zzz: I encourage people who are willing and able, to enable it, and keep up to date with development builds
+(04:11:58 PM) anonymousmaybe is now known as Irc2PGuest25323
+(04:12:00 PM) zzz: we're still finding bugs in the basic protocol
+(04:12:20 PM) zzz: and we're continuing implementation of relay and peer test, which are like sub-protocols
+(04:12:41 PM) zzz: fixing other non-ssu2 bugs along the way
+(04:12:54 PM) zzz: eyedeekay, you and I need to update the roadmap both for the past release and the next one
+(04:13:13 PM) zzz: EOT unless there's any questions
+(04:13:23 PM) eyedeekay: Yes indeed, I've got some stuff to move to 1.9.0
+(04:13:50 PM) eyedeekay: for me my main goal in Java is to finish UDP tunnels in HSM, that's one of the things that moves to 1.9.0
+(04:14:10 PM) eyedeekay: otherwise my immediate goal is to work on NTCP2 in go-i2p, which will probably be hard work but I'm excited to get started
+(04:14:18 PM) eyedeekay: EOT for me as well
+(04:14:48 PM) zzz: ok, as usual, target big changes to go in early in the cycle please
+(04:15:06 PM) eyedeekay: Will do
+(04:15:13 PM) eyedeekay: Anything else for 3?
+(04:15:35 PM) zzz: nope, let's plan for a release in late August
+(04:15:44 PM) eyedeekay: 4. MoneroKon 2022
+(04:16:36 PM) eyedeekay: This one is just an announcement, there is going to be quite a bit of I2P related stuff happening at Monero Konferenco 2022 in less than 2 weeks, the 18th and 19th
+(04:17:10 PM) zzz: Lisbon, correct?
+(04:17:22 PM) eyedeekay: Yes Lisbon
+(04:17:54 PM) eyedeekay: But people who aren't in Lisbon are able to stream it from the web site for the conference, https://monerokon.com
+(04:17:58 PM) zzz: I'd like to plug the two students sponsored by diva.exchange that will be giving a presentation on their research there
+(04:18:17 PM) zzz: you have a workshop also? what about?
+(04:18:35 PM) eyedeekay: I'm going to be there to run a workshop on adapting applications to the I2P network
+(04:19:29 PM) eyedeekay: I'm going to present on the decisions people need to make when selecting an API, how to find a router, how to build an I2P plugin
+(04:19:40 PM) zzz: fantastic. there's going to be a lot of I2P brainpower there to help people and answer questions, I hope you get a good turnout
+(04:19:51 PM) anonymousmaybe is now known as Irc2PGuest29437
+(04:20:28 PM) eyedeekay: I hope so too, it's my favorite topic :)
+(04:21:45 PM) eyedeekay: zlatinb is going to be there as well, so if you can please come see us
+(04:22:28 PM) eyedeekay: That's all I've got for 4, anything else for the meeting?
+(04:23:55 PM) eyedeekay: All right thanks everybody for coming, same time next month
+(04:24:59 PM) obscuratus: eyedeekay: Are they going to stream your workshop?
+(04:25:53 PM) eyedeekay: I'm not sure, I'll make all the materials open/permissively licensed regardless
+(04:26:24 PM) obscuratus: Neat topic.  If they stream it, or if you can post a video later, I'll watch it.
+(04:26:32 PM) eyedeekay: I believe the box I marked on the form was that I did consent to be streamed
+(04:27:34 PM) zzz: eyedeekay, the times on your reddit post are lisbon local?
+(04:27:58 PM) eyedeekay: Yes the schedule on the monerokon website are UTC+1 which is Lisbon Local
+(04:28:39 PM) eyedeekay: *times on the monerokon website
+(04:29:07 PM) zzz: ok so 5 hours ahead of eastern, so the students are on at 5:30 AM 

i2p2www/meetings/logs/312.rst

@@ -0,0 +1,11 @@
+I2P dev meeting, June 7, 2022 @ 20:00 UTC
+=========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+eyedeekay,
+zzz,
+zlatinb

i2p2www/pages/blog/post.html

@@ -19,9 +19,4 @@
 {{ body }}
 {% endautoescape %}
 </div>
-<p>
-<a href="https://flattr.com/submit/auto?user_id=I2P&url={{ canonical() }}" target="_blank">
-<img src="{{ url_for('static', filename='images/flattr-badge-large.png') }}" alt="Flattr this" title="Flattr this" border="0">
-</a>
-</p>
 {% endblock %}

i2p2www/pages/downloads/browser-content.html

@@ -1,18 +1,9 @@
-<p>{% trans -%}
-Your web browser will need to be configured in order to browse web sites on I2P
-and to utilize the outproxies available within I2P. Below are walkthroughs for
-some of the most popular browsers.
-{%- endtrans %}</p>
+<p>{% trans -%} Your web browser will need to be configured in order to browse web sites on I2P and to utilize the outproxies available within I2P. Below are walkthroughs for some of the most popular browsers. {%- endtrans %}</p>
 
 <h2>{{ _('Firefox Profile for Windows') }}</h2>
-<p>{% trans profile='/firefox' -%}
-If you are using Windows, the recommended way of accessing I2P is using the
-<a href='{{ profile }}'>Firefox profile</a>.
-{%- endtrans %}</p>
-<p>{% trans -%}
-If you do not wish to use that profile or are not on Windows, you need to
-configure your browser yourself.  Read below on how to that.
-{%- endtrans %}</p>
+<p>{% trans profile='/firefox' -%} If you are using Windows, the recommended way of accessing I2P is using the
+    <a href='{{ profile }}'>Firefox profile</a>. {%- endtrans %}</p>
+<p>{% trans -%} If you do not wish to use that profile or are not on Windows, you need to configure your browser yourself. Read below on how to that. {%- endtrans %}</p>
 
 <h2>{{ _('How to configure your browser') }}</h2>
 
@@ -26,94 +17,50 @@ configure your browser yourself.  Read below on how to that.
 
 <a name="firefox"></a>
 <h3>Firefox</h3>
-<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}A new way of automatically configuring the I2P Browser is
-currently being tested. It uses the Firefox's "Container Tabs" to build private
-browsing tools for use with I2P and I2P applications.{% endtrans %}</p>
-<p>{% trans %}It does pre-configuration of your browser by enabling some of
-the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy
-obedience. It also contains menus, shortcuts, and monitoring tools improving
-Firefox's integration with I2P. It is a by-product of the I2P Browser project.
-{% endtrans %}</p>
-<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>,
-can be obtained from the Mozilla addon store.
-{% endtrans %}</p>
+<h4>{% trans %}Extension-based Configuration: I2P in Private Browsing{% endtrans %}</h4>
+<p>{% trans %}A new way of automatically configuring the I2P Browser is currently being tested. It uses the Firefox's "Container Tabs" to build private browsing tools for use with I2P and I2P applications.{% endtrans %}</p>
+<p>{% trans %}It does pre-configuration of your browser by enabling some of the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy obedience. It also contains menus, shortcuts, and monitoring tools improving Firefox's integration
+    with I2P. It should not substantially interfere with your non-I2P Firefox tabs. {% endtrans %}</p>
+<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>, can be obtained from the Mozilla addon store. {% endtrans %}</p>
+<p>{% trans %}The source code for the extension is, <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox">i2pgit.org</a>. {% endtrans %}</p>
 <h4>{% trans %}Instructions for Firefox 57 and above:{% endtrans %}</h4>
-<p>{% trans -%}
-From the Menu button in the top right, select <em>Preferences</em>.
-Scroll down until you see the <em>Network Proxy</em> section, as shown in the
-screenshot below. Click on <em>Settings</em>
-{%- endtrans %}</p>
-<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}"
-alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}">
-<p>{% trans -%}
-In the <em>Connection Settings</em> pop-up, select <em>Manual proxy
+<p>{% trans -%} From the Menu button in the top right, select <em>Preferences</em>. Scroll down until you see the <em>Network Proxy</em> section, as shown in the screenshot below. Click on <em>Settings</em> {%- endtrans %}</p>
+<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}" alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}">
+<p>{% trans -%} In the <em>Connection Settings</em> pop-up, select <em>Manual proxy
     configuration</em>. Set both the HTTP and SSL Proxy to address
-<code>127.0.0.1</code> with port <code>4444</code> as shown in the following
-screenshot.
-{%- endtrans %}</p>
+    <code>127.0.0.1</code> with port <code>4444</code> as shown in the following screenshot. {%- endtrans %}</p>
 <img src="{{ url_for('static',
 filename='images/firefox57.connectionsettings.png') }}" alt="{{ _('Firefox57
 Connection Settings') }}" title="{{ _('Firefox57 Connection Settings') }}">
-<p>{% trans -%}
-Finally, go to the address <em>about:config</em> and find the property
-media.peerConnection.ice.proxy_only. Ensure that this setting is True.
-{%- endtrans %}</p>
+<p>{% trans -%} Finally, go to the address <em>about:config</em> and find the property media.peerConnection.ice.proxy_only. Ensure that this setting is True. {%- endtrans %}</p>
 <img src="{{ url_for('static',
 filename='images/firefox.webrtc.png') }}" alt="{{ _('Firefox57
 PeerConnection Settings') }}" title="{{ _('Firefox57 PeerConnection Settings') }}">
 
 <a name="chrome"></a>
 <h3>{% trans %} Chrome {% endtrans %}</h3>
-<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}An experimental, partially-automated configuration process for
-Chrome is available. In order to configure it, create a new <em>Profile</em>
-especially for your I2P browsing, separate from the default profile. Then install
-this <a href="https://chrome.google.com/webstore/detail/i2pchromejs/ikdjcmomgldfciocnpekfndklkfgglpe"><em>Extension</em></a> in your newly-created profile. This profile
-is now configured to use I2P. Highly detailed instructions are available at the
-<a href="https://eyedeekay.github.io/I2P-Configuration-for-Chromium">homepage.</a>
-{% endtrans %}</p>
+<h4>{% trans %}Extension-based Configuration: I2PChrome.js(Experimental, additional configuration){% endtrans %}</h4>
+<p>{% trans %}An experimental, partially-automated configuration process for Chrome is available. In order to configure it, create a new <em>Profile</em> especially for your I2P browsing, separate from the default profile. Then install this <a href="https://chrome.google.com/webstore/detail/i2pchromejs/ikdjcmomgldfciocnpekfndklkfgglpe"><em>Extension</em></a>    in your newly-created profile. This profile is now configured to use I2P. Highly detailed instructions are available at the
+    <a href="https://eyedeekay.github.io/I2P-Configuration-For-Chromium">homepage.</a> {% endtrans %}</p>
 <h4>{% trans %}All Chrome Versions{% endtrans %}</h4>
-<p>{% trans -%}
-Chromium-Based Browsers like Chrome have slightly different places for their
-proxy settings depending on variant and platform. These instructions may be
-slightly different in Brave or Iridium, for instance. From the <em>Main</em>
-menu, navigate to the <em>Settings</em>, and search for the <em></em> menu item.
-Clicking it will open the right settings for your platform.
-{%- endtrans %}</p>
+<p>{% trans -%} Chromium-Based Browsers like Chrome have slightly different places for their proxy settings depending on variant and platform. These instructions may be slightly different in Brave or Iridium, for instance. From the <em>Main</em> menu, navigate
+    to the <em>Settings</em>, and search for the <em></em> menu item. Clicking it will open the right settings for your platform. {%- endtrans %}</p>
 <img src="{{ url_for('static', filename='images/chrome.proxy.png') }}" alt="{{ _('Chrome Proxy Options') }}" title="{{ _('Chrome Proxy Options') }}">
-<p>{% trans -%}
-On Windows, this button will launch you into the shared proxy settings used
-by <a href="#ie8"><em>Internet Explorer</em></a>, and you can configure it by
-following the Internet Explorer 8 guide.
-{%- endtrans %}</p>
+<p>{% trans -%} On Windows, this button will launch you into the shared proxy settings used by <a href="#ie8"><em>Internet Explorer</em></a>, and you can configure it by following the Internet Explorer 8 guide. {%- endtrans %}</p>
 
 <a name="android"></a>
 <h3>{% trans %} IceRaven and other Firefoxes for Android {% endtrans %}</h3>
 <h4>{% trans %}Extension-based Configuration{% endtrans %}</h4>
-<p>{% trans %}Modern Firefoxes(The "Fenix" based Firefoxes) do not generally have
-an about:config page for you to configure proxy settings manually. It is further
-not possible to use most extensions in Fenix-based Firefoxes. It is possible to
-enable support about:config and enable more extensions in Firefox Nightly at the time 
-of this writing, but it's a manual and difficult process. <em>IceRaven</em> is a fork
-of Firefox which enables a collection of extensions while Mozilla and the Mozilla
-Community work on adding support for extensions to Firefox for Android. It provides
-the easiest way of configuring a modern Firefox-based Browser for Android. It does
-not come from Mozilla and carries no guarantees from them. <em>Installing the extension
+<p>{% trans %}Modern Firefoxes(The "Fenix" based Firefoxes) do not generally have an about:config page for you to configure proxy settings manually. It is further not possible to use most extensions in Fenix-based Firefoxes. It is possible to enable support
+    about:config and enable more extensions in Firefox Nightly at the time of this writing, but it's a manual and difficult process. <em>IceRaven</em> is a fork of Firefox which enables a collection of extensions while Mozilla and the Mozilla Community
+    work on adding support for extensions to Firefox for Android. It provides the easiest way of configuring a modern Firefox-based Browser for Android. It does not come from Mozilla and carries no guarantees from them. <em>Installing the extension
 in IceRaven will proxy all your IceRaven browsing over I2P.</em>{% endtrans %}</p>
-<p>{% trans %}If you have not installed IceRaven yet, go to the next step. If you have been
-using IceRaven for a while, go to the main menu, select the History tab, and make
-sure that you have cleared information about your past browsing by tapping the
-"Delete History" button.{% endtrans %}</p>
-<p>{% trans %}Open the IceRaven main menu, and scroll to the top until you see the "Add-Ons"
-submenu. Tap the "Add-Ons Manager" option in the "Add-Ons" submenu. Install
-the extension named <em>I2P Proxy for Android and other Systems</em>.
-{% endtrans %}</p>
-<p>{% trans %}Your IceRaven browser is now configured to use I2P.
-{% endtrans %}</p>
-<p>{% trans %}This extension also works in pre-Fenix(Pre-Firefox-68) Firefox based
-web browsers, if installed from the following addons.mozilla.org URL.
-<em><a href="https://addons.mozilla.org/en-US/android/addon/i2p-proxy/">I2P Proxy for Android and Other Systems</a><em>
+<p>{% trans %}If you have not installed IceRaven yet, go to the next step. If you have been using IceRaven for a while, go to the main menu, select the History tab, and make sure that you have cleared information about your past browsing by tapping the "Delete
+    History" button.{% endtrans %}</p>
+<p>{% trans %}Open the IceRaven main menu, and scroll to the top until you see the "Add-Ons" submenu. Tap the "Add-Ons Manager" option in the "Add-Ons" submenu. Install the extension named <em>I2P Proxy for Android and other Systems</em>. {% endtrans %}</p>
+<p>{% trans %}Your IceRaven browser is now configured to use I2P. {% endtrans %}</p>
+<p>{% trans %}This extension also works in pre-Fenix(Pre-Firefox-68) Firefox based web browsers, if installed from the following addons.mozilla.org URL.
+    <em><a href="https://addons.mozilla.org/en-US/android/addon/i2p-proxy/">I2P Proxy for Android and Other Systems</a><em>
 {% endtrans %}</p>
 <p>{% trans %}This extension is identical to the Chromium extension and is built from the same source.{% endtrans %}</p>
 <p>{% trans %}In order to enable extension support in Firefox Nightly, you should follow
@@ -141,14 +88,14 @@ settings and your browser is set to use the I2P proxy.
 <a name="TOS"></a>
 <h3>{{ _('Outproxy Terms Of Service') }}</h3>
 <p>{% trans -%}
-Remember: I2P was not designed for creating proxies to the outer Internet.
+I2P is not designed for creating proxies to the Internet.
 Instead, it is meant to be used as an internal network.
 {%- endtrans %}</p>
 <p>{% trans -%}
 <p><b>The I2P project itself does not run any proxies to the Internet.</b>
-The only outproxy is a service from the privacy solutions project.
-Consider donating to them for a continued stable service. Increased funding will
-allow them to improve this service. </p>
+The I2P software includes two outproxies: false.i2p and outproxy-tor.meeh.i2p.
+Even though domain names are different, it's the same outproxy you hit,
+multihomed/keyed for better performance. These are run by a volunteer. </p>
 <a href="http://privacysolutions.no"
     target="_blank">http://privacysolutions.no</a>
 {%- endtrans %}</p>
@@ -158,13 +105,12 @@ and <code>{{ https }}</code>. Even the domain names are different, it's the same
 (multi-homed/keyed for better performance)
 {%- endtrans %}</p>
 <p>{% trans -%}
-Filtering is active on these outproxies (for example, mibbit and torrent
-tracker access is blocked). I2P Sites
-that are accessible via .i2p addresses are also not allowed via the outproxies.
+Filtering is active on these outproxies (for example, mibbit and torrent tracker
+access is blocked). I2P Sites that are accessible via .i2p addresses are also
+not allowed via the outproxies.
 As a convenience, the outproxy blocks ad servers.
 {%- endtrans %}</p>
 <p>{% trans -%}
-<a href="https://www.torproject.org">Tor</a> is a good application to use as an
-outproxy to the Internet.
+<a href="https://www.torproject.org">Tor</a> provides a browser to use as an outproxy to the Internet.
 {%- endtrans %}</p>
-<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->
+<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->

i2p2www/pages/downloads/debian.html

@@ -3,27 +3,19 @@
 {% block content %}
 <h1>{{ _('Debian I2P Packages') }}</h1>
 
-<h2 id="bionic">{{ _('Debian Buster, Ubuntu Bionic, and later') }}</h2>
-{% trans -%}
-I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
-However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
-If you are not running Debian Sid or the latest Ubuntu release,
-use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
-{%- endtrans %}
-
 <h2 id="others">{{ _('Debian or Ubuntu, All Versions') }}</h2>
 {% trans -%}The Debian packages should work on most platforms running:{%- endtrans %}
 <ul>
-  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
-  <li><a href="#ubuntu">Mint</a></li>
-  <li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer){% endtrans %}</li>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Bionic <em>18.04</em> and newer){% endtrans %}</li>
+  <li>{% trans %}<a href="#ubuntu">Mint</a>(Tara<em>19</em>) or newer{% endtrans %}</li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Buster and newer){% endtrans %}</li>
   <li><a href="#debian">Knoppix</a></li>
 </ul>
 
-{% trans trac='http://trac.i2p2.de/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p' -%}
+{% trans gtitlab='https://i2pgit.org/i2p-hackers/i2p.i2p/' -%}
 The I2P packages <em>may</em> work on systems not listed above. Please report any issues
-with these packages on <a href="{{ trac }}">Trac</a> at
-<a href="{{ trac }}">https://trac.i2p2.de</a>.
+with these packages on <a href="{{ gtitlab }}">Gitlab</a> at
+<a href="{{ gtitlab }}">i2p.i2p</a>.
 {%- endtrans %}
 <ul>
   <li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
@@ -37,8 +29,8 @@ with these packages on <a href="{{ trac }}">Trac</a> at
     {% trans %}Open a terminal and enter:{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; sudo apt-add-repository ppa:i2p-maintainers/i2p</code><br />
 {% trans -%}
-This command will add the PPA to /etc/apt/sources.list.d and fetch the
-gpg key that the repository has been signed with. The GPG key ensures
+This command will add the PPA to <code>/etc/apt/sources.list.d</code> and fetch
+the gpg key that the repository has been signed with. The GPG key ensures
 that the packages have not been tampered with since being built.
 {%- endtrans %}
   </li>
@@ -55,27 +47,35 @@ was added with the earlier command.
     <code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
 </ol>
 
-<h5>{{ _('Adding the PPA Using Synaptic') }}</h5>
+<h5>{{ _('Adding the PPA Using the Software Center') }}</h5>
 <ol>
   <li>
-    {% trans -%}
-    Open Synaptic (System -&gt; Administration -&gt; Synaptic Package Manager).
+    {% trans -%}Open "Software and Updates" via the applications menu.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-menu.png"></img>
   </li>
   <li>
-    {% trans -%}
-    Once Synaptic opens, select <em>Repositories</em> from the <em>Settings</em> menu.
+    {% trans -%}Select the "Other Software" tab and click the "Add" button at the
+    bottom to configure the PPA.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-addother.png"></img>
   </li>
   <li>
-    {% trans -%}
-    Click the <em>Other Sources</em> tab and click <em>Add</em>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <em>Add Source</em>. Click the <em>Close</em> button then <em>Reload</em>.
+    {% trans -%}Add the PPA by pasting the URL: <code>ppa:i2p-maintainers/i2p</code>
+    into the PPA dialog.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-ppatool.png"></img>
   </li>
   <li>
-    {% trans -%}
-    In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
+    {% trans -%}Download the repository information with the "Reload" button.
     {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-reload.png"></img>
+  </li>
+  <li>
+    {% trans -%}Install the I2P software using the "Software" tool from the
+    applications menu.
+    {%- endtrans %}
+    <img src="/_static/images/download/ubuntu/software-center-software.png"></img>
   </li>
 </ol>
 
@@ -92,100 +92,110 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
 Note: The steps below should be performed with root access (i.e., switching
 user to root with <code>su</code> or by prefixing each command with <code>sudo</code>).
 {%- endtrans %}</p>
-<ol>
-  <li>{% trans -%}Ensure that <code>apt-transport-https</code> and <code>curl</code> are installed.{%- endtrans %}
+<ol>,
+  <li>{% trans -%}Ensure that <code>apt-transport-https</code>, <code>curl</code>, <code>lsb-release</code> are installed.{%- endtrans %}
     <pre>
     <code>
     sudo apt-get update
-    sudo apt-get install apt-transport-https curl</code>
+    sudo apt-get install apt-transport-https lsb-release curl</code>
     </pre>
   </li>
   <li>{% trans file='/etc/apt/sources.list.d/i2p.list',file2='/etc/debian_version' %}
     Check which version of Debian you are using on this page at the <a href="https://wiki.debian.org/LTS/" target="_blank">Debian wiki</a>
     and verify with <code>{{ file2 }}</code> on your system.
-    Then, add lines like the following to <code>{{ file }}</code>.{% endtrans %}<br>
-<br />
-For Buster (stable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ buster main
-    deb-src https://deb.i2p2.de/ buster main</code>
-</pre>
-
-<br />
-For Stretch (oldstable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ stretch main
-    deb-src https://deb.i2p2.de/ stretch main</code>
-</pre>
-
-<br />
-For Jessie (oldoldstable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ jessie main
-    deb-src https://deb.i2p2.de/ jessie main</code>
-</pre>
-
-<br />
-For Wheezy (obsolete):<br>
-<pre>
-    <code>deb https://deb.i2p2.de/ wheezy main
-    deb-src https://deb.i2p2.de/ wheezy main</code>
-</pre>
-<br />
-
-{% trans -%}Note: If you are running Debian Sid (testing), then you can install I2P directly from Debian's main repository{%- endtrans %}:
-  <pre>
-  <code>sudo apt-get install i2p</code>
-  </pre>
+    Then, for Debian Bullseye or newer distributions run the following command to create <code>{{ file }}</code>.{% endtrans %}<br>
+    <pre>
+    <code>
+    # Use this command on Debian Bullseye or newer only.
+  echo "deb [signed-by=/usr/share/keyrings/i2p-archive-keyring.gpg] https://deb.i2p2.de/ $(lsb_release -sc) main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
+    {% trans -%}If you're using a downstream variant of Debian like LMDE or Kali Linux, the following command fill find the correct version for your distribution:{%- endtrans %}
+    <pre>
+    <code>
+    # Use this command on Debian Bullseye or newer only.
+  echo "deb [signed-by=/usr/share/keyrings/i2p-archive-keyring.gpg] https://deb.i2p2.de/ $(dpkg --status tzdata | grep Provides | cut -f2 -d'-') main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
+    {% trans -%}If you are using Debian Buster or older official Debian distributons, use the following command instead:{%- endtrans %}
+    <pre>
+    <code>
+    # Use this command on Debian Buster or older only.
+  echo "deb https://deb.i2p2.de/ $(lsb_release -sc) main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
+    {% trans -%}If you're using a downstream variant of Debian like LMDE or Kali Linux, the following command fill find the correct version for your distribution:{%- endtrans %}
+    <pre>
+    <code>
+    # Use this command on Debian Buster or older only.
+  echo "deb https://deb.i2p2.de/ $(dpkg --status tzdata | grep Provides | cut -f2 -d'-') main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
 
   </li>
 
-  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.asc') -%}
-Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
-<pre>
-<code>
-  curl -o i2p-debian-repo.key.asc https://geti2p.net/_static/i2p-debian-repo.key.asc</code>
-</pre>
+  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.gpg') -%}
+  Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
+    <pre>
+    <code>
+  curl -o i2p-archive-keyring.gpg https://geti2p.net/_static/i2p-archive-keyring.gpg</code>
+    </pre>
   </li>
 
   <br />
 
-  <li>
-    {% trans -%}Check the fingerprint and owner of the key without importing anything{%- endtrans %}:<br />
+  <li>{% trans -%}Display the key fingerprint.{%- endtrans %}
     <pre>
     <code>
-  gpg -n --import --import-options import-show i2p-debian-repo.key.asc</code>
+  gpg --keyid-format long --import --import-options show-only --with-fingerprint i2p-archive-keyring.gpg
+    </code>
+    </pre>
+    {% trans -%}Verify that this key fingerprint matches the output:{%- endtrans %}
+    <pre>
+    <code>
+  7840 E761 0F28 B904 7535  49D7 67EC E560 5BCF 1346</code>
     </pre>
   </li>
 
-  <li>
-    {% trans -%} Add the key to APT's keyring{%- endtrans %}:<br />
+  <br />
+
+  <li>{% trans -%}Copy the keyring to the keyrings directory:{%- endtrans %}
     <pre>
     <code>
-  sudo apt-key add i2p-debian-repo.key.asc</code>
+  sudo cp ~/i2p-archive-keyring.gpg /usr/share/keyrings</code>
+    </pre>
+    If you are using a distribution older than Debian Buster, you will also need
+    to symlink that key to <code>/etc/apt/trusted.gpg.d</code>.
+    <pre>
+    <code>
+  sudo ln -sf /usr/share/keyrings/i2p-archive-keyring.gpg /etc/apt/trusted.gpg.d/i2p-archive-keyring.gpg</code>
     </pre>
   </li>
-
+  
   <li>
-    {% trans %}Notify your package manager of the new repository by entering{% endtrans %}<br />
+    {% trans %}Notify your package manager of the new repository by entering:{% endtrans %}<br />
     <pre>
     <code>
   sudo apt-get update</code>
-    </pre>
-{% trans -%}
-This command will retrieve the latest list of software from every
-repository enabled on your system, including the I2P repository added in step
-1.
-{%- endtrans %}
-  </li><br />
-  <li>{% trans -%}
-You are now ready to install I2P! Installing the <code>i2p-keyring</code>
-package will ensure that you receive updates to the repository's GPG key.
-{%- endtrans %}<br />
-<pre>
+    </pre>{% trans -%}This command will retrieve the latest list of software
+    from every repository enabled on your system, including the I2P repository
+    added in step 1.{%- endtrans %}
+  </li>
+  
+  <br />
+
+  <li>{% trans -%}You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+  package will ensure that you receive updates to the repository's GPG key.
+  {%- endtrans %}<br />
+    <pre>
     <code>
   sudo apt-get install i2p i2p-keyring</code>
-  </pre></li>
+    </pre>
+  </li>
 </ol>
 <p>
 {% trans -%}

i2p2www/pages/downloads/docker.html

@@ -0,0 +1,134 @@
+{% extends "global/layout.html" %}
+{% block title %}Docker{% endblock %}
+{% block accuratefor %}0.9.50{% endblock %}
+{% block content %}
+<h1 id="i2p-in-docker">{% trans -%}Installing I2P in Docker{%- endtrans %}</h1>
+<h3 id="quick-start">{% trans -%}Very quick start{%- endtrans %}</h3>
+<p>{% trans -%}If you just want to give I2P a quick try or are using it in a home network, follow these steps{%- endtrans %}:</p>
+<ol>
+<li>{% trans -%}Create two directories "i2pconfig" and "i2ptorrents"{%- endtrans %}</li>
+<li>{% trans -%}Copy the following text and save it in a file "docker-compose.yml".{%- endtrans %}</li>
+<pre><code>
+version: "3.5"
+services:
+    i2p:
+        image: geti2p/i2p
+        network_mode: host
+        volumes:
+            - ./i2pconfig:/i2p/.i2p
+            - ./i2ptorrents:/i2psnark
+</code></pre>
+<li>{% trans -%}Execute "docker-compose up"{%- endtrans %}</li>
+<li>{% trans -%}Start a browser and go to http://127.0.0.1:7657 to complete the setup wizard.{%- endtrans %}</li>
+</ol>
+<p>{% trans -%}Note that this quick-start approach is not recommended for production deployments on remote servers.  Please read the rest of this document for more information.{%- endtrans %}</p>
+<h3 id="building-an-image">{% trans -%}Building an image{%- endtrans %}</h3>
+<p>{% trans -%}There is an i2P image available over at <a href="https://hub.docker.com">DockerHub</a>. If you do not want to use that one, you can build one yourself:{%- endtrans %}</p>
+<pre><code>docker build -t i2p .</code></pre>
+<h3 id="running-a-container">{% trans -%}Running a container{%- endtrans %}</h3>
+<h4 id="volumes">{% trans -%}Volumes{%- endtrans %}</h4>
+<p>{% trans -%}The container requires a volume for the configuration data to be mounted. Optionally, you can mount a separate volume for torrent (“i2psnark”) downloads. See the example below.{%- endtrans %}</p>
+<h4 id="memory-usage">{% trans -%}Memory usage{%- endtrans %}</h4>
+<p>{% trans -%}By the default the image limits the memory available to the Java heap to 512MB. You can override that with the <code>JVM_XMX</code> environment variable.{%- endtrans %}</p>
+<h4 id="ports">{% trans -%}Ports{%- endtrans %}</h4>
+<p>{% trans -%}There are several ports which are exposed by the image. You can choose which ones to publish depending on your specific needs.{%- endtrans %}</p>
+<table>
+<thead>
+<tr class="header">
+<th>{% trans -%}Port{%- endtrans %}</th>
+<th>{% trans -%}Interface{%- endtrans %}</th>
+<th>{% trans -%}Description{%- endtrans %}</th>
+<th>{% trans -%}TCP/UDP{%- endtrans %}</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>4444</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}HTTP Proxy{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>4445</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}HTTPS Proxy{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="odd">
+<td>6668</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}IRC Proxy{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>7654</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}I2CP Protocol{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="odd">
+<td>7656</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}SAM Bridge TCP{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>7657</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}Router console{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="odd">
+<td>7658</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}I2P Site{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>7659</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}SMTP Proxy{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="odd">
+<td>7660</td>
+<td>127.0.0.1</td>
+<td>{% trans -%}POP3 Proxy{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>7652</td>
+<td>{% trans -%}LAN interface{%- endtrans %}</td>
+<td>{% trans -%}UPnP{%- endtrans %}</td>
+<td>{% trans -%}TCP{%- endtrans %}</td>
+</tr>
+<tr class="odd">
+<td>7653</td>
+<td>{% trans -%}LAN interface{%- endtrans %}</td>
+<td>{% trans -%}UPnP{%- endtrans %}</td>
+<td>{% trans -%}UDP{%- endtrans %}</td>
+</tr>
+<tr class="even">
+<td>12345</td>
+<td>0.0.0.0</td>
+<td>{% trans -%}I2NP Protocol{%- endtrans %}</td>
+<td>{% trans -%}TCP and UDP{%- endtrans %}</td>
+</tr>
+</tbody>
+</table>
+<p>{% trans -%}You probably want at least the Router Console (7657) and the HTTP Proxy (4444). If you want I2P to be able to receive incoming connections from the internet, and hence not think it’s firewalled, publish the I2NP Protocol port (12345) - but make sure you publish to a different random port, otherwise others may be able to guess you’re running I2P in a Docker image.{%- endtrans %}</p>
+<h4 id="example">{% trans -%}Networking{%- endtrans %}</h4>
+<p>{% trans -%}A best-practices guide for cloud deployments is beyond the scope of this document, but in general you should try to minimize the number of published ports, while exposing only the I2NP ports to the internet.  That means that the services in the list above which are bound to 127.0.0.1 (which include the router console) will need to be accessed via other methods like ssh tunneling or be manually configured to bind to a different interface.{%- endtrans %}</p>
+<h4 id="example">{% trans -%}Example{%- endtrans %}</h4>
+<p>{% trans -%}Here is an example container that mounts <code>i2phome</code> as home directory, <code>i2ptorrents</code> for torrents, and opens HTTP Proxy, IRC, Router Console and I2NP Protocols. It also limits the memory available to the JVM to 256MB.{%- endtrans %}</p>
+<pre><code>docker run \
+    -e JVM_XMX=256m \
+    -v i2phome:/i2p/.i2p \
+    -v i2ptorrents:/i2psnark \
+    -p 4444:4444 \
+    -p 6668:6668 \
+    -p 7657:7657 \
+    -p 54321:12345 \
+    -p 54321:12345/udp \  # I2NP port needs TCP and UDP.  Change the 54321 to something random, greater than 1024.
+    i2p:latest</code></pre>
+{% endblock %}

i2p2www/pages/downloads/easyinstall.html

@@ -0,0 +1,133 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package_outer with context -%}
+{% block title %}I2P Easy Install Bundle (Beta) for Windows{% endblock %}
+{% block content %}
+
+<h1>{{ _('I2P Easy Install Bundle (Beta) for Windows') }}</h1>
+<p>{% trans firefox="/firefox" -%}
+This is an "All-in-One" installer for Windows 10 which includes the complete I2P
+desktop software and all of its dependencies in a single, easy-to-install
+package. It is built on the premise that I2P should be easy, and that we should
+help our users get their initial configuration in place instead of requiring an
+elaborate install process. To learn more about the Firefox profile that
+comes bundled with this installer, visit <a href="{{ firefox }}">The Firefox
+Profile Page</a>.
+{%- endtrans %}</p>
+<h2>{{ _('What do I need to use it?') }}</h2>
+<p><strong>{% trans -%}
+Just Firefox (Or Tor Browser).{%- endtrans %}</strong>
+{% trans issueurl="https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/2" -%}
+This installer still requires Firefox to be installed on the system, it does not
+bundle a Firefox installer of its own. Please obtain Firefox from Mozilla, or
+Tor Browser from the Tor Project or one of their mirrors. If you would like to
+discuss supporting other browsers, please join the discussionon the
+<a href="{{ issueurl }}">Gitlab Issue</a>. This is a Windows-only
+product.
+{%- endtrans %}</p>
+<h2>{{ _('Why should I use it?') }}</h2>
+<p>{% trans -%}
+This installer package reduces the number of steps required to install an I2P
+router on Windows from about 30 to a matter of completing a single, familiar
+installer process, combining the I2P installation and Browser configuration into
+the same steps. Besides that, it launches the user directly into the
+automatically configured I2P browser with their applications ready-to-use, with
+no need to refer to potentially unhelpful system-wide Windows settings. The I2P
+it uses is otherwise identical to the "regular" I2P.
+{%- endtrans %}</p>
+<h2>{{ _('How do I use it?') }}</h2>
+<p>{% trans firefox="https://www.mozilla.org/", postfilename=pver('I2P-Profile-Installer-%s.exe') -%}
+First, download and install <a href="{{ firefox }}">Firefox</a>, then,
+just download and install <a href="{{ postfilename }}">this installer</a>. To
+start an installer, "double-click" the downloaded .exe file.
+{%- endtrans %}</p>
+<p>{% trans -%}
+Running the installer will create a shortcut to start browsing I2P in your start
+menu and on your desktop. Clicking this shortcut will start I2P if necessary,
+then start an I2P Browser. On the first run, you will also be promted with the
+bandwidth wizard in your browser window. You will also see a "Toopie" icon in
+your taskbar to indicate that I2P is working when the browser window is closed.
+{%- endtrans %}</p>
+<p>{% trans -%}
+I2P Browsing uses a separate, I2P-Only Firefox
+profile, so it won't interfere with your regular Firefox use or require any
+special configuration. You don't even need to close existing Firefox windows.
+{%- endtrans %}</p>
+
+{%- set name     = 'Windows' -%}
+{%- set icon     = 'images/download/windows.png' -%}
+{%- set filename = 'I2P-Profile-Installer-%s-signed.exe' -%}
+{%- set hash     = '0012fd31a0bbfca36c820055de00682365d7955d53b11e79432fb2b2ea05432c' -%}
+
+{% call package_outer('windows', name, icon) %}
+    <div class = "file">
+	    <a class = "default" href="{{ url_for('downloads_redirect', version=pver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=pver(filename) )}}">
+		    <span class = "name">{{ pver(filename) }}</span><br/>
+		    <span class="mirror">{{ _('Mirror:') }} <img src="{{ url_for('static', filename='images/flags/'+def_mirror.country+'.png') }}" /> {{ def_mirror.org }}</span>
+	    </a>
+	    <a class="mirrors" href="{{ get_url('downloads_select', version=pver(), file=pver(filename)) }}">{{ _('select alternate mirror') }}</a>
+    </div>
+    <div class="meta">
+	    <div class="hash">
+		    <code>{{ hash }}</code>
+	    </div>
+    </div>
+    <p>{% trans -%}
+    Download that file and complete the steps it shows.
+    {%- endtrans %}</p>
+{% endcall %}
+
+{% trans signer='zlatinb',
+signingkey=url_for('static', filename='zlatinb.key.crt') -%}
+The files are signed by {{ signer }},
+<a href="{{ signingkey }}">whose key is here</a>.
+{%- endtrans %}
+
+<h2>{{ _('What is in it?') }}</h2>
+<p><strong>{% trans -%}
+A Jpackaged I2P Router: {%- endtrans %}</strong>
+{% trans -%}The I2P router is "jpackaged" which means that it includes all
+the required Java components it needs to run successfully. It does not require
+a separate Java installation, because it bundles a Java 16 Runtime which is only
+used for I2P.
+{%- endtrans %}</p>
+<p><strong>{% trans -%}
+Browser Extensions: {%- endtrans %}</strong>
+{% trans -%}The browser profile also includes both the NoScript and HTTPSEverywhere plugin for
+better protection Javascript based attacks and HTTPS support where available. It
+also keeps your I2P search activity separate from your visible internet search
+activity. The profile configures the I2P Proxy for all sites and browser features.
+I2P In Private Browsing is used to provide I2P-Specific browser integrations.
+{%- endtrans %}</p>
+<h3>{{ _('Source Code and Issue Tracking') }}</h3>
+<div>{% trans -%}
+If you would like to examine the source code for individual components, you may
+find it on i2pgit.org or github.com. The license for each respective component
+can be found in the license directory of the <code>i2p.firefox</code> project.
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p.firefox">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+<div><a href="https://github.com/i2p/i2p.firefox">{% trans -%}Github Repository{%- endtrans %}</a></div>
+<div>{% trans -%}
+If you wish to file an issue about the Firefox profile, please use Gitlab to
+contact us. For security-sensitive issues, please remember to check the
+"This issue is confidential and should only be visible to team members with at least Reporter access"
+option when filing the issue.
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p.firefox/issues">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+<h2>{{ _('How is it different from Tor Browser?') }}</h2>
+<p>{% trans -%}
+This is not a fork of Firefox. Instead, it is a browser profile with pre-configured
+settings, combined with an I2P router and some launcher scripts. That means that
+it requires Firefox(Or Tor Browser) to be installed before you can use it. This
+is for security reasons, it is important that you are able to recieve reliable
+updates from a trustworthy vendor.
+{%- endtrans %}</p>
+<p>{% trans -%}
+I2P routers are designed to have long uptimes, and so unlike Tor Browser, the
+lifetime of your I2P Router is not tied to the lifetime of your I2P browsing
+session. The browser profile will manage your history, your browser's local
+storage and cache, and your browsing context but it will never stop your I2P
+router on its own. You may stop the router using the web interface on the
+router console homepage.
+{%- endtrans %}</p>
+
+{% endblock %}

i2p2www/pages/downloads/firefox.html

@@ -2,22 +2,46 @@
 {%- from "downloads/macros" import package_outer with context -%}
 {% block title %}Firefox Profile{% endblock %}
 {% block content %}
-<h1>{{ _('I2P Firefox Browser Profile') }}</h1>
+
+<h1>{{ _('I2P Easy Install Bundle (Beta) for Windows') }}</h1>
+<p>{% trans nsis="/nsis" -%}
+The I2P Firefox Browser Profile has been expanded into the new I2P Easy Install
+Bundle, which is in Beta. If you already have an I2P Router installed, it is
+still safe to use this installer to configure your I2P Browser. Your existing
+I2P Settings will be left untouched. If you do not have an I2P router installed,
+then you do not need to install I2P. This package will install I2P at the same
+time it installs the browser profile. This page has been kept to document the
+motivations and design of the included Firefox profile. To learn more about the
+new bundle, visit <a href="{{ nsis }}">The Easy Install Bundle Page</a>.
+{%- endtrans %}</p>
+<h2>{{ _('I2P Firefox Browser Profile') }}</h2>
 <p>{% trans -%}
 Now that you have joined the I2P network, you will want to see I2P Sites and and 
-other content that is hosted on the network. The Firefox browser is 
-pre-configured to allow you to access the content available on the network. It 
-also keeps your I2P search activity separate from your internet search activity.
+other content that is hosted on the network. The Firefox browser profile is 
+pre-configured to allow you to access the content available on the network.
 {%- endtrans %}</p>
+<h2>{{ _('Why should I use it?') }}</h2>
 <p>{% trans -%}
-This browser also includes both the NoScrpt and HTTPSEverywhere plugin for
-better protection Javascript based attacks and HTTPS support where available.
+Browsers are highly complex and powerful engines for executing code and displaying
+information obtained mainly from strangers on the internet. By default, they
+tend to leak a great deal of information about the person using them to the servers
+they retrieve information from. Using this browser profile allows you to become
+part of a "common" set of very similar browser users, instead of appearing unique
+or revealing details of your hardware or software. Because this involves disabling 
+some browser features, this also reduces the attack surface available to outsiders. 
+This keeps you safer while browsing the Invisible Web.
+{%- endtrans %}</p>
+<h2>{{ _('How do I use it?') }}</h2>
+<p>{% trans firefox="https://www.mozilla.org/", postfilename=pver('I2P-Profile-Installer-%s.exe') -%}
+First, download and install <a href="{{ firefox }}">Firefox</a>, then,
+just download and install <a href="{{ postfilename }}">this installer</a>. To
+start an installer, "double-click" the downloaded .exe file.
 {%- endtrans %}</p>
 
 {%- set name     = 'Windows' -%}
 {%- set icon     = 'images/download/windows.png' -%}
-{%- set filename = 'I2P-Profile-Installer-%s.exe' -%}
-{%- set hash     = '8eb1e9f69200a42192acabe4686bb3541f7f409b2f9702f2f9e5c6870515fa56' -%}
+{%- set filename = 'I2P-Profile-Installer-%s-signed.exe' -%}
+{%- set hash     = 'eadb338a5895f73e6ed4985a9f7dfdac722f74c9bcdd0bd35957e7dcd5759a3a' -%}
 
 {% call package_outer('windows', name, icon) %}
     <div class = "file">
@@ -43,4 +67,52 @@ The files are signed by {{ signer }},
 <a href="{{ signingkey }}">whose key is here</a>.
 {%- endtrans %}
 
+<h2>{{ _('What is in it?') }}</h2>
+<p><strong>{% trans -%}
+A Jpackaged I2P Router: {%- endtrans %}</strong>
+{% trans -%}The I2P router is "jpackaged" which means that it includes all
+the required Java components it needs to run successfully. It does not require
+a separate Java installation, because it bundles a Java 16 Runtime which is only
+used for I2P.
+{%- endtrans %}</p>
+<p><strong>{% trans -%}
+Browser Extensions: {%- endtrans %}</strong>
+{% trans -%}The browser profile also includes both the NoScript and HTTPSEverywhere plugin for
+better protection Javascript based attacks and HTTPS support where available. It
+also keeps your I2P search activity separate from your visible internet search
+activity. The profile configures the I2P Proxy for all sites and browser features.
+I2P In Private Browsing is used to provide I2P-Specific browser integrations.
+{%- endtrans %}</p>
+<h3>{{ _('Source Code and Issue Tracking') }}</h3>
+<div>{% trans -%}
+If you would like to examine the source code for individual components, you may
+find it on i2pgit.org or github.com. The license for each respective component
+can be found in the license directory of the <code>i2p.firefox</code> project.
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p.firefox">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+<div><a href="https://github.com/i2p/i2p.firefox">{% trans -%}Github Repository{%- endtrans %}</a></div>
+<div>{% trans -%}
+If you wish to file an issue about the Firefox profile, please use Gitlab to
+contact us. For security-sensitive issues, please remember to check the
+"This issue is confidential and should only be visible to team members with at least Reporter access"
+option when filing the issue.
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p.firefox/issues">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+<h2>{{ _('How is it different from Tor Browser?') }}</h2>
+<p>{% trans -%}
+This is not a fork of Firefox. Instead, it is a browser profile with pre-configured
+settings, combined with an I2P router and some launcher scripts. That means that
+it requires Firefox(Or Tor Browser) to be installed before you can use it. This
+is for security reasons, it is important that you are able to recieve reliable
+updates from a trustworthy vendor.
+{%- endtrans %}</p>
+<p>{% trans -%}
+I2P routers are designed to have long uptimes, and so unlike Tor Browser, the
+lifetime of your I2P Router is not tied to the lifetime of your I2P browsing
+session. The browser profile will manage your history, your browser's local
+storage and cache, and your browsing context but it will never stop your I2P
+router on its own. You may stop the router using the web interface on the
+router console homepage.
+{%- endtrans %}</p>
+
 {% endblock %}

i2p2www/pages/downloads/lab.html

@@ -1,191 +0,0 @@
-{% extends "global/layout.html" %}
-{%- from "downloads/macros" import package_outer with context -%}
-{% block title %}I2P Lab{% endblock %}
-{% block content %}
-<h1>{{ _('I2P Laboratory') }}</h1>
-<p>
-{% trans -%}
-Welcome to the I2P Laboratory!
-This is the home of various experimental projects that are not yet ready to go live.
-We invite you to look around and give them a try, but we do not offer support for them.
-Any of these projects may be discontinued at any time.
-{%- endtrans %}
-</p>
-<p>
-{% trans forum='https://i2pforum.net/viewforum.php?f=36' -%}
-We welcome your feedback at the <a href="{{ forum }}">I2P Forum</a>.
-{%- endtrans %}
-<p>
-
-<hr>
-
-<h3>{{ _('Current Projects') }}</h3>
-<div class = "labproject" >
-<h5>{{ _('Zero-Dependency installer') }}</h5>
-<p>
-{% trans forum='https://i2pforum.net/viewforum.php?f=36' %}
-This is an I2P installer for Windows that does not depend on an existing Java installation.
-It includes all required dependencies.
-<p>This installer is built using the Java 9+ utility JLink which bundles a minimum JRE and creates an executable.  The source code is in the monotone branch "i2p.jlink".  After that an NSIS script is used to create the actual installer.  The source code for that script is in the monotone "i2p.wininst" branch.</p>
-<p>You can report bugs in the <a href="{{ forum }}">I2P Lab Forum</a>.</p>
-{%- endtrans %}
-</p>
-{% trans %}
-<p>Status: Proof-Of-Concept</p>
-<p>Known Bugs And Limitations: plugins that use pack200 compression do not work.</p>
-{%- endtrans %}
-
-{%- set name     = 'Windows' -%}
-{%- set icon     = 'images/download/windows.png' -%}
-{%- set filename = 'Zero-I2P0.9.41-JRE11.0.3-INST0.1.exe' -%}
-{%- set hash     = '95dd4a6db5719319c2a5cf509ab3f551114fb76f677ca395e4f20af8ec88c204' -%}
-{% call package_outer('windows', name, icon) %}
-<div class = "file">
-	<a class = "default" href="https://download.i2p2.de/experimental/Zero-I2P0.9.41-JRE11.0.3-INST0.1.exe">
-		<span class = "name">{{ filename }}</span>
-	</a>
-</div>
-<div class = "meta">
-	<div class = "hash">
-		<code>{{ hash }}</code>
-	</div>
-</div>
-<p>{% trans -%}
-Download that file and run it.
-{%- endtrans %}</p>
-{% endcall %}
-</div>
-<!--
-{% trans signer='zlatinb',
-signingkey=url_for('static', filename='zlatinb.key.crt') -%}
-The files are signed by {{ signer }},
-<a href="{{ signingkey }}">whose key is here</a>.
-{%- endtrans %}
--->
-
-
-<div class = "labproject" >
-  <h5>{{ _('I2P Browser') }}</h5>
-  <p>{% trans -%}
-  The Invisible Internet browser is a fork of TorBrowser/Mozilla Firefox ESR that comes preconfigured with proxy settings, NoScript and i2pbutton which contains some security/privacy improvements like a drag and drop filter and external app blocker.
-  {%- endtrans %}</p>
-  <p>{% trans -%}
-  Builds for Linux, Windows and Mac OS X are available. Currently we provide binaries for 64bit systems. 32bit builds for Linux and Windows are planned.
-  {%- endtrans %}</p>
-  <p>{% trans -%}
-  At this time I2P Browser does not ship with its own I2P router. Ensure that you have I2P installed and running before you launch the I2P Browser.
-  {%- endtrans %}</p>
-  {% trans %}
-  Status: Beta-4
-  <ul>
-    <li><a href="https://github.com/mikalv/test-i2p-browser">Firefox Branch</a></li>
-    <li><a href="https://github.com/mikalv/i2p-browser-build-scripts">Build Scripts</a></li>
-    <li><a href="https://github.com/mikalv/i2pbutton">Browser Extension</a></li>
-  </ul>
-  {%- endtrans %}
-
-  {%- set name     = 'Windows' -%}
-  {%- set icon     = 'images/download/windows.png' -%}
-  {%- set filename = 'i2pbrowser-install-win64-2.0-beta4_en-US.exe' -%}
-  {%- set hash     = '65a2f84a7dca9d000e359dc1cd5168555f363a29a837fadbbf9fff58c8b7bad9' -%}
-  {% call package_outer('windows', name, icon) %}
-  <div class = "file">
-    <a class = "default" href="https://download.i2p2.de/experimental/i2pbrowser-beta4/windows64/i2pbrowser-install-win64-2.0-beta4_en-US.exe">
-      <span class = "name">{{ filename }}</span>
-    </a>
-  </div>
-  <div class = "meta">
-    <div class = "hash">
-      <code>{{ hash }}</code>
-    </div>
-  </div>
-  <p>{% trans -%}
-  The default is to download the english version, however it's also built for some other languages,
-  please check out the link below
-  if you want to see if we have the browser in your language.
-  {%- endtrans %}</p>
-  <a href="https://download.i2p2.de/experimental/i2pbrowser-beta4/windows64/">https://download.i2p2.de/experimental/i2pbrowser-beta4/windows64/</a>
-  {% endcall %}
-
-  {%- set name     = 'Mac OS X' -%}
-  {%- set icon     = 'images/download/mac-osx.png' -%}
-  {%- set filename = 'I2PBrowser-2.0-beta4-osx64_en-US.dmg' -%}
-  {%- set hash     = '95dff56f2443920f027a9a649793f67a37db55850980035956d7dcaad95f0d93' -%}
-  {% call package_outer('mac-osx', name, icon) %}
-  <div class = "file">
-    <a class = "default" href="https://download.i2p2.de/experimental/i2pbrowser-beta4/macosx64/I2PBrowser-2.0-beta4-osx64_en-US.dmg">
-      <span class = "name">{{ filename }}</span>
-    </a>
-  </div>
-  <div class = "meta">
-    <div class = "hash">
-      <code>{{ hash }}</code>
-    </div>
-  </div>
-  <p>{% trans -%}
-  The default is to download the english version, however it's also built for some other languages,
-  please check out the link below
-  if you want to see if we have the browser in your language.
-  {%- endtrans %}</p>
-  <a href="https://download.i2p2.de/experimental/i2pbrowser-beta4/macosx64/">https://download.i2p2.de/experimental/i2pbrowser-beta4/macosx64/</a>
-  {% endcall %}
-
-  {%- set name     = 'Linux' -%}
-  {%- set icon     = 'images/download/freebsd-tux.png' -%}
-  {%- set filename = 'i2p-browser-linux64-2.0-beta4_en-US.tar.xz' -%}
-  {%- set hash     = 'da772ebe03937b09915f9016d9c09b64666025b4ae4c9353861dcf40d916ca7d' -%}
-  {% call package_outer('freebsd-tux', name, icon) %}
-  <div class = "file">
-    <a class = "default" href="https://download.i2p2.de/experimental/i2pbrowser-beta4/linux64/i2p-browser-linux64-2.0-beta4_en-US.tar.xz">
-      <span class = "name">{{ filename }}</span>
-    </a>
-  </div>
-  <div class = "meta">
-    <div class = "hash">
-      <code>{{ hash }}</code>
-    </div>
-  </div>
-  <p>{% trans -%}
-  The default is to download the english version, however it's also built for some other languages,
-  please check out the link below
-  if you want to see if we have the browser in your language.
-  {%- endtrans %}</p>
-  <a href="https://download.i2p2.de/experimental/i2pbrowser-beta4/linux64">https://download.i2p2.de/experimental/i2pbrowser-beta4/linux64</a>
-  {% endcall %}
-</div>
-
-<div class = "labproject" >
-  <h5>{{ _('Docker image') }}</h5>
-  <p>
-  {% trans %}
-  This is an I2P Docker image for those that prefers containers.
-  It includes all required dependencies.
-  {%- endtrans %}
-  </p>
-  {% trans %}
-  Status: Proof-Of-Concept
-  {%- endtrans %}
-
-  {%- set name     = 'Linux' -%}
-  {%- set icon     = 'images/download/freebsd-tux.png' -%}
-  {% call package_outer('freebsd-tux', name, icon) %}
-  <div class = "file">
-    <a class = "default" href="https://hub.docker.com/r/meeh/i2p.i2p">
-      <span class = "name">docker pull meeh/i2p.i2p</span>
-    </a>
-  </div>
-  <p>{% trans -%}
-  Run the command to pull from docker hub.
-  {%- endtrans %}</p>
-  <br>
-  <p>{% trans -%}
-
-  {%- endtrans %}</p>
-  Bugs can be reported on <a href="https://trac.i2p2.de/newticket?component=package/docker">trac</a> (With component set to package/docker).
-  The source code (Dockerfile) can be found at our repository. You can also view it at github, <a href="https://github.com/i2p/i2p.i2p/blob/master/Dockerfile">here</a>.
-  The ports 7654,7656,7657,7658,4444,6668,8998,7659,7660 and 4445 are exposed (tcp) but some depends on your router config if they are up or not, and would be off by default.
-  {% endcall %}
-</div>
-
-
-{% endblock %}

i2p2www/pages/downloads/list.html

@@ -1,280 +1,156 @@
-{% extends "global/layout.html" %}
-{%- from "downloads/macros" import package, package_outer with context -%}
-
-{% set release_signer = 'zzz' %}
-
-{% block title %}{{ _('Download') }}{% endblock %}
-{% block content_nav %}
+{% extends "global/layout.html" %} {%- from "downloads/macros" import package, package_outer with context -%} {% set release_signer = 'zzz' %} {% block title %}{{ _('Download') }}{% endblock %} {% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
 <ul>
-<li><a href="#windows">Windows</a>
-<li><a href="#mac">Mac OS X</a>
-<li><a href="#unix">GNU/Linux / BSD / Solaris</a>
-<li><a href="#deb">Debian / Ubuntu</a>
-<li><a href="#android">Android</a>
-<li><a href="#source">{{ _('Source package') }}</a>
-<li><a href="#auto">{{ _('Automatic updates') }}</a>
-<li><a href="#update-file">{{ _('Manual updates') }}</a>
+    <li><a href="#windows">Windows</a></li>
+    <li><a href="#mac">Mac OS X</a></li>
+    <li><a href="#unix">GNU/Linux / BSD / Solaris</a></li>
+    <li><a href="#deb">Debian / Ubuntu</a></li>
+    <li><a href="#android">Android</a></li>
+    <li><a href="#source">{{ _('Source package') }}</a></li>
+    <li><a href="#auto">{{ _('Automatic updates') }}</a></li>
+    <li><a href="#update-file">{{ _('Manual updates') }}</a></li>
 </ul>
-{% endblock %}
-
-{% block content %}
+{% endblock %} {% block content %}
 <!--<h3>{{ _('Lab') }}</h3>
 {% trans lab='/lab' %}
 If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
 {% endtrans -%}-->
-<h3>{{ _('Getting Started') }}</h3>
-<p>{% trans java='https://java.com/download/',
-openjdk='http://openjdk.java.net/install/',
-icedtea='http://icedtea.classpath.org/wiki/Main_Page',
-arm8='https://openjdk.java.net/install/',
-ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
-detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %}
-In addition to the I2P download, you need to install Java if you do not have it 
-already installed. I2P requires Java Runtime Version 7 or higher.
-(<a href="{{ java }}">Oracle</a>,
-<a href="{{ openjdk }}">OpenJDK</a>, or
-<a href="{{ icedtea }}">IcedTea</a>
-Java Version 7 or 8 recommended,
-except Raspberry Pi: <a href="{{ arm8 }}">OpenJDK 9 for ARM</a>,
-PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
-<br />
-<a href="{{ detectjre }}">Determine your installed Java version here</a>
-or type <tt>java -version</tt> at your command prompt.
-{% endtrans %}
-</p><p>
-{% trans -%}
-Windows: Java 8 is recommended. Java 9 or higher may not work.
-{%- endtrans %}
-</p>
 
 <h3>{{ _('Release Notes') }}</h3>
-<ul><li>
-<a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
-</li><li>
-<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
-</li><li>
-<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/debian/changelog">{{ _('Debian Change Log') }}</a>
-</li><li>
-<a href="https://raw.githubusercontent.com/i2p/i2p.android.base/master/CHANGELOG">{{ _('Android Change Log') }}</a>
-</li></ul>
-
-
-
-<h3>{{ _('Pick your I2P Bundle') }}</h3>
-
-<p>
-When you download the I2P software bundle, you get everything you need to connect
-and start participating in the I2P network and community. It even includes basic
-applications for every user, like e-mail, bittorrent, and a basic I2P Site for
-you to personalize and share.
-</p>
-
-<p>After you've installed, a set up wizard will help you configure a few
-important things like how much bandwidth you would like to share while your
-router begins to make connections to the network. After the set up wizard is
-complete, you will be directed to the console home page where you can access
-the rest of the applications or configure, monitor, or troubleshoot your
-I2P connections.</p>
+<ul>
+    <li>
+        <a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
+    </li>
+    <li>
+        <a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
+    </li>
+    <li>
+        <a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/debian/changelog">{{ _('Debian Change Log') }}</a>
+    </li>
+    <li>
+        <a href="https://raw.githubusercontent.com/i2p/i2p.android.base/master/CHANGELOG">{{ _('Android Change Log') }}</a>
+    </li>
+</ul>
 
 <div class="downloadlist">
 
-{% call package('windows') %}
-    <p>{% trans -%}
-    Download the file and double-click to run it.
-    {%- endtrans %}</p>
+    <h5>{%- trans %}I2P for Windows{%- endtrans %}</h5>
+    {% call package('windows') %}
+    <p>{% trans java='https://java.com/download' -%}The default I2P installer requires Java to be installed. You can obtain it from <a href="{{java}}">Oracle</a> or from your choice of Java distribution. After installing Java, download the file and double-click
+        to run it. {%- endtrans %}</p>
+    <h3>{% trans %}Easy Install Bundle For Windows (Beta){% endtrans %}</h3>
     <div class="file">
-      <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}If you need additional help setting up dependencies and getting I2P ready, a detailed install guide is available here.{% endtrans %}</a>
+        <p>{% trans %}It is now possible to install all I2P components using a single package (<strong>No Java required</strong>). To try out the new installer, click below. This bundle can also be used to configure a Firefox Profile. It will not interfere
+            with an existing I2P installation if one exists.{% endtrans %}</p>
+        <a class="default" href="/nsis">{% trans %}I2P Easy Install Bundle For Windows (Beta){% endtrans %}</a>
     </div>
+    <h3>{% trans %}Detailed Install Guide{% endtrans %}</h3>
     <div class="file">
-      <a class="default" href="/firefox">{% trans %}I2P Firefox Browser Profile{% endtrans %}</a>
+        <p></p>
+        <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}Here is a helpful guide to installing I2P for Windows using a separate Java installation and the classic installer.{% endtrans %}</a>
     </div>
-{% endcall %}
-{% call package('mac') %}
-    <p>{% trans i2pversion=ver() -%}
-    The most reliable way to launch the installer is from a terminal like this:
-    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
-    Depending on how your computer is set up, you may be able to start the
-    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
-    right-clicking the file and selecting &quot;Open with Java&quot;.
-    Unfortunately, this behaviour is difficult to predict.
-    {%- endtrans %}</p>
+    {% endcall %}
+
+    <h5>{%- trans %}I2P Easy Install Bundle for Mac OS X{%- endtrans %}</h5>
+    {% call package_outer('mac', "Mac OS X", 'images/download/mac-osx.png') %}
+    <h3>{% trans %}I2P Easy Install Bundle for Mac OS X{% endtrans %}</h3>
+    <p>{% trans i2pversion=ver() -%}The I2P Easy Install Bundle for Mac OS X is packaged using OSX's standard ".dmg" package type, which allows it to use Apple's built-in tools to securely, reliably, and easily install the package. It does not require Java to be installed.
+        {%- endtrans %}</p>
+    <div class="file">
+        <a class="default" href="{{ get_url('downloads_mac') }}">{% trans %}I2P Easy Install Bundle for Mac OS X{% endtrans %}</a>
+    </div>
+    {% endcall %}
+
+    <h5>{%- trans %}I2P for Linux{%- endtrans %}</h5>
+    {% call package('unix') %}
+    <p>{% trans i2pversion=ver() -%} The most reliable way to launch the installer is from a terminal like this:
+        <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer. Depending on how your computer is set up, you may be able to start the installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file
+        or right-clicking the file and selecting &quot;Open with Java&quot;. Unfortunately, this behaviour is difficult to predict. {%- endtrans %}</p>
 
     <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
-    {% trans i2pversion=ver() -%}
-    I2P can also be installed in a terminal environment, which may be especially
-    useful for servers, containers, or certain virtual machines. If you wish to
-    use the installer without a GUI, you can use the command 
-    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
-    the install procedure in your terminal.
-    {%- endtrans %}
-{% endcall %}
+    {% trans i2pversion=ver() -%} I2P can also be installed in a terminal environment, which may be especially useful for servers, containers, or certain virtual machines. If you wish to use the installer without a GUI, you can use the command
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow the install procedure in your terminal. {%- endtrans %} {% endcall %}
 
-{% call package('unix') %}
-    <p>{% trans i2pversion=ver() -%}
-    The most reliable way to launch the installer is from a terminal like this:
-    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
-    Depending on how your computer is set up, you may be able to start the
-    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
-    right-clicking the file and selecting &quot;Open with Java&quot;.
-    Unfortunately, this behaviour is difficult to predict.
-    {%- endtrans %}</p>
-
-    <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
-    {% trans i2pversion=ver() -%}
-    I2P can also be installed in a terminal environment, which may be especially
-    useful for servers, containers, or certain virtual machines. If you wish to
-    use the installer without a GUI, you can use the command 
-    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
-    the install procedure in your terminal.
-    {%- endtrans %}
-{% endcall %}
-
-{% call package_outer('deb', 'Debian / Ubuntu', 'images/download/debian-ubuntu.png') %}
+    <h5>{%- trans %}I2P for Debian and Ubuntu{%- endtrans %}</h5>
+    {% call package_outer('deb', 'Debian / Ubuntu', 'images/download/debian-ubuntu.png') %}
     <div class="file">
-      <a class="default" href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
+        <a class="default" href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
     </div>
-    <p>{% trans -%}
-    I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
-    However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
-    If you are not running Debian Sid or the latest Ubuntu release,
-    use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
-    {%- endtrans %}</p>
-{% endcall %}
+    <p>{% trans -%} I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid. However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions. If you are not running Debian Sid or the
+        latest Ubuntu release, use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version. {%- endtrans %}</p>
+    {% endcall %}
 
-{% call package('android') %}
+    <h5>{%- trans %}I2P for Android{%- endtrans %}</h5>
+    {% call package('android') %}
     <div class="warning">
-      {% trans -%}
-      Requires Android 4.0 (Ice Cream Sandwich) or higher. If you earlier installed
-      I2P, unfortunately this release fixes some IPC issues which will force you to uninstall your current installation before installing this.
-      {%- endtrans %}
-      {% trans -%}
-      512 MB RAM minimum; 1 GB recommended.
-      {%- endtrans %}
-      {% trans -%}
-      The releases are not compatible with eachother, as they have different signatures. Uninstall them
-      completely before installing any other version. The apk's from download.i2p2.de are signed by idk.
-      {%- endtrans %}
+        {% trans -%} Requires Android 4.0 (Ice Cream Sandwich) or higher. If you earlier installed I2P, unfortunately this release fixes some IPC issues which will force you to uninstall your current installation before installing this. {%- endtrans %} {% trans
+        -%} 512 MB RAM minimum; 1 GB recommended. {%- endtrans %} {% trans -%} The releases are not compatible with eachother, as they have different signatures. Uninstall them completely before installing any other version. The apk's from download.i2p2.de
+        are signed by idk. {%- endtrans %}
     </div>
-{% endcall %}
+    {% endcall %}
 
-{% call package_outer('docker', 'Docker', 'images/download/docker.png') %}
+    <h5>{%- trans %}I2P for Docker{%- endtrans %}</h5>
+    {% call package_outer('docker', 'Docker', 'images/download/docker.png') %}
     <div class="meta">
+        <!--
+        TODO: next time we do a release and set a git tag, change this to match the
+        sha256 hash of the docker container.
         <div class="hash">
-        <code>35cb620d82c6cab8764792720c061379bb8493325d75ad2e376455b44718935</code>
-        </div>
+        <code>1de04ec13945a0505e5b23e2bd22ad9cfaac0da3372c972160b58322b1ca48eb</code>
+        </div>-->
     </div>
-    <p>{% trans -%}I2P is now available as a Docker package from the Docker Hub.
-    You may retrieve the image by running the 'docker pull' command.
-      {%- endtrans %}
+    <p>{% trans -%}I2P is now available as a Docker package from the Docker Hub. You may retrieve the image by running the 'docker pull' command. {%- endtrans %}
     </p>
     <pre><code>{% trans-%}
-    docker pull meeh/i2p.i2p
+    docker pull geti2p/i2p
       {%- endtrans %}
     </pre></code>
-    <a href="https://hub.docker.com/r/meeh/i2p.i2p/">Docker Hub</a>
-
-{% endcall %}
-
-
-
-
-{% call package('source') %}
-    <p>{% trans monotoneurl=site_url('get-involved/guides/new-developers'),
-             gitrepo='http://'+i2pconv('git.repo.i2p')+'/w/i2p.i2p.git',
-             github='https://github.com/i2p/i2p.i2p',
-             i2pversion=ver() -%}
-    Alternately, you can fetch the source from <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>
-    or via Git from <a href="{{ gitrepo }}">git.repo.i2p</a> or <a href="{{ github }}">Github</a>.
-    <br />
-    Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either
-    run the GUI installer or headless install as above.
-    {%- endtrans %}</p>
-    <p>{% trans monotoneurl=site_url('get-involved/guides/new-developers'),
-             github='https://github.com/i2p/i2p.android.base' -%}
-    Android source is in <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>
-    and on <a href="{{ github }}">Github</a>.
-    Android builds require the I2P source.
-    See the documentation in the Android source for additional build requirements and instructions.
-    {%- endtrans %}</p>
-{% endcall %}
+    <a href="https://hub.docker.com/r/geti2p/i2p/">Docker Hub</a>
+    <div class="file">
+        <a class="default" href="{{ get_url('downloads_docker') }}">{% trans %}Additional instructions for configuring your container can be found here.{% endtrans %}</a>
+    </div>
+    {% endcall %} {% call package('source') %}
+    <p>{% trans monotoneurl=site_url('get-involved/guides/new-developers'), gitrepo='http://'+i2pconv('git.repo.i2p')+'/w/i2p.i2p.git', github='https://github.com/i2p/i2p.i2p', android='https://github.com/i2p/i2p.android.base', i2pversion=ver() -%} Alternately,
+        you can fetch the source via <a href="{{ monotoneurl }}#getting-the-i2p-code">Git</a> from <a href="{{ gitrepo }}">git.repo.i2p</a> or <a href="{{ github }}">Github</a>.
+        <br /> Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either run the GUI installer or headless install as above. {%- endtrans %}</p>
+    <p>{% trans monotoneurl=site_url('get-involved/guides/new-developers'), github='https://github.com/i2p/i2p.android.base' -%} Android source is also in <a href="{{ monotoneurl }}#getting-the-i2p-code">git</a> on <a href="{{ android }}">Github</a>. Android
+        builds require the I2P source. See the documentation in the Android source for additional build requirements and instructions. {%- endtrans %}</p>
+    {% endcall %}
 
 </div>
 
-{% trans signer=release_signer,
-signingkey=site_url('get-involved/develop/release-signing-key') -%}
-The files are signed by {{ signer }},
-<a href="{{ signingkey }}">whose key is here</a>.
-{%- endtrans %}
-
-{% trans signer='zlatinb',
-signingkey=url_for('static', filename='zlatinb.key.crt') -%}
-The Windows installer is signed by {{ signer }},
-<a href="{{ signingkey }}">whose key is here</a>.
-{%- endtrans %}
-
-{% trans signer='mikalv (meeh)',
-signingkey=url_for('static', filename='mikalv.key.crt') -%}
-The Mac OS X native installer is signed by {{ signer }} with his Apple Developer ID certificate,
-<a href="{{ signingkey }}">whose key is here</a>.
-{%- endtrans %}
+{% trans signer=release_signer, signingkey=site_url('get-involved/develop/release-signing-key') -%} The files are signed by {{ signer }},
+<a href="{{ signingkey }}">whose key is here</a>. {%- endtrans %} {% trans signer='zlatinb', signingkey=url_for('static', filename='zlatinb.key.crt') -%} The Windows installer is signed by {{ signer }},
+<a href="{{ signingkey }}">whose key is here</a>. {%- endtrans %} {% trans signer='mikalv (meeh)', signingkey=url_for('static', filename='mikalv.key.crt') -%} The Mac OS X native installer is signed by {{ signer }} with his Apple Developer ID certificate,
+<a href="{{ signingkey }}">whose key is here</a>. {%- endtrans %}
 
 <h3 id="update">{{ _('Updates from earlier releases:') }}</h3>
 
-<p>{% trans -%}
-Both automatic and manual upgrades are available for the release.
-{%- endtrans %}</p>
+<p>{% trans -%} Both automatic and manual upgrades are available for the release. {%- endtrans %}</p>
 
 {% call package_outer('auto', _('Automatic updates'), 'images/download/update-auto.png') %}
-<p>{% trans -%}
-If you are running 0.7.5 or later, your router should detect the
-new release. To upgrade simply click the 'Download Update' button on your router console
-when it appears.
-{%- endtrans %}</p>
-    <div class="warning">
-<p>{% trans -%}
-Since 0.9.23, some releases are signed by str4d, whose signing key has been in the router
-since 0.9.9. Routers older than 0.9.9 will fail to verify update files signed by str4d,
-and will need to be manually updated using the process below.
-{%- endtrans %}</p>
-    </div>
-{% endcall %}
-
-{% call package('update-file') %}
+<p>{% trans -%} If you are running 0.7.5 or later, your router should detect the new release. To upgrade simply click the 'Download Update' button on your router console when it appears. {%- endtrans %}</p>
+<div class="warning">
+    <p>{% trans -%} Since 0.9.23, some releases are signed by str4d, whose signing key has been in the router since 0.9.9. Routers older than 0.9.9 will fail to verify update files signed by str4d, and will need to be manually updated using the process below.
+        {%- endtrans %}</p>
+</div>
+{% endcall %} {% call package('update-file') %}
 <ol>
-<li>
-    {% trans -%}
-    Download the file to your I2P
-    installation directory and <b>rename as i2pupdate.zip</b>.
-    (alternately, you can get the source as above and run "ant updater", then copy the
-    resulting i2pupdate.zip to your I2P installation directory).  You do
-    NOT need to unzip the file.
-    {%- endtrans %}
-</li>
-<li>
-    {% trans -%}
-    Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a>
-    {%- endtrans %}
-</li>
-<li>
-    {% trans -%}
-    Grab a cup of coffee and come back in 11 minutes
-    {%- endtrans %}
-</li>
+    <li>
+        {% trans -%} Download the file to your I2P installation directory and <b>rename as i2pupdate.zip</b>. (alternately, you can get the source as above and run "ant updater", then copy the resulting i2pupdate.zip to your I2P installation directory).
+        You do NOT need to unzip the file. {%- endtrans %}
+    </li>
+    <li>
+        {% trans -%} Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a> {%- endtrans %}
+    </li>
+    <li>
+        {% trans -%} Grab a cup of coffee and come back in 11 minutes {%- endtrans %}
+    </li>
 </ol>
-{% endcall %}
-
-{% trans signer=release_signer,
-signingkey=site_url('get-involved/develop/release-signing-key') -%}
-The file is signed by {{ signer }},
-<a href="{{ signingkey }}">whose key is here</a>.
-{%- endtrans %}
+{% endcall %} {% trans signer=release_signer, signingkey=site_url('get-involved/develop/release-signing-key') -%} The file is signed by {{ signer }},
+<a href="{{ signingkey }}">whose key is here</a>. {%- endtrans %}
 
 <h3>{{ _('Previous Releases') }}</h3>
 
-{% trans echelon=i2pconv('echelon.i2p') -%}
-Previous releases are available on <a href="http://code.google.com/p/i2p/downloads/list?can=1">Google Code</a>
-and <a href="https://launchpad.net/i2p/trunk">Launchpad</a>
-and within the I2P network on <a href="http://{{ echelon }}/">{{ echelon }}</a>.
-{%- endtrans %}
-
-{% endblock %}
+{% trans echelon=i2pconv('echelon.i2p') -%} Previous releases are available on <a href="http://code.google.com/p/i2p/downloads/list?can=1">Google Code</a> and <a href="https://launchpad.net/i2p/trunk">Launchpad</a> and within the I2P network on <a href="http://{{ echelon }}/">{{ echelon }}</a>.
+{%- endtrans %} {% endblock %}

i2p2www/pages/downloads/mac.html

@@ -0,0 +1,88 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package_outer with context -%}
+{% block title %}Mac OS X Easy Install Bundle{% endblock %}
+{% block content %}
+
+<h1>{{ _('Mac OS X Easy Install Bundle') }}</h1>
+<p>{% trans -%}
+We are excited to offer you a DMG-based bundle for Mac OS X.  It installs and behaves
+the same way many other Mac OS X applications do and does not require a Java
+Runtime Environment to be available.
+{%- endtrans %}</p>
+<p>{% trans perf="https://i2pgit.org/i2p-hackers/i2p-jpackage-mac/-/issues/1" -%}
+This bundle is built for <code>x86_64(Intel)</code> Macs. It will run on
+<code>ARM(M1)</code> Macs in emulated mode, but the performance is unknown. M1 Mac
+users should report results to us at the <a href="{{ perf }}">Gitlab Repository</a>.
+{%- endtrans %}</p>
+<h2>{{ _('How do I use it?') }}</h2>
+<p>{% trans -%}
+Double-Click on the .dmg file, which you may download from this page. When a
+window appears with the I2P application inside it, "drag" the application to the
+"Applications" side of the window to install it. Once you're finished, I2P is
+installed and can be launched from Finder. This procedure is the same as any
+other Mac application. When you launch I2P, the I2P icon will appear on the Dock
+and a few seconds later a browser will open with the I2P console page, inviting
+you to complete the bandwidth setup wizard.
+{%- endtrans %}</p>
+<p>{% trans browser="https://geti2p.net/htproxyports" -%}
+If you want to browse hidden websites ('eepsites') on the I2P network, you need
+to configure your browser. Instructions for configuring a range of browsers are
+available on <a href="{{ browser }}">the browser configuration
+page</a>.
+{%- endtrans %}</p>
+<h2>{{ _('Why should I use it?') }}</h2>
+<p>{% trans -%}
+Two important reasons, 1) because this package is a .dmg, it can be signed with
+a certificate which will be recognized by your computer. This means that your
+computer can automatically make sure that you've obtained I2P from the I2P
+Project, rather than a potentially altered or "fake" installer, and 2) because
+it makes I2P easier to install and work with on Apple computers by using tools
+that are familiar and built-into the operating system.
+{%- endtrans %}</p>
+
+{%- set name     = 'OSX' -%}
+{%- set icon     = 'images/download/mac-osx.png' -%}
+{%- set filename = 'I2P-%s.dmg' -%}
+{%- set hash     = '18cb22cfcc3cbe0cec150e89a394d1a35703cb508ed627ef48084b7ba7c90dde' -%}
+
+{% call package_outer('osx', name, icon) %}
+    <div class = "file">
+	    <a class = "default" href="{{ url_for('downloads_redirect', version=mver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=mver(filename) )}}">
+		    <span class = "name">{{ mver(filename) }}</span><br/>
+		    <span class="mirror">{{ _('Mirror:') }} <img src="{{ url_for('static', filename='images/flags/'+def_mirror.country+'.png') }}" /> {{ def_mirror.org }}</span>
+	    </a>
+	    <a class="mirrors" href="{{ get_url('downloads_select', version=mver(), file=mver(filename)) }}">{{ _('select alternate mirror') }}</a>
+    </div>
+    <div class="meta">
+	    <div class="hash">
+		    <code>{{ hash }}</code>
+	    </div>
+    </div>
+    <p>{% trans -%}
+Download that file and double-click on it.  Accept the License Agreement, then
+drag the <code>I2P</code> icon on top of the <code>Applications</code> icon.
+Launch I2P from Finder.
+    {%- endtrans %}</p>
+{% endcall %}
+
+<h2>{{ _('Limitations') }}</h2>
+<p>{% trans -%}
+I2P will not install any launch agents on your Mac.  If you want I2P to start on
+system startup, you need to configure a launch agent yourself. You can configure
+I2P to launch when your user logs in by right-clicking on the I2P Dock icon.
+{%- endtrans %}</p>
+<h3>{{ _('Source Code and Issue Tracking') }}</h3>
+<div>{% trans -%}
+If you would like to examine the source code for individual components, you may
+find it on i2pgit.org.  
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p-jpackage-mac">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+<div>{% trans -%}
+If you wish to file an issue about the DMG Bundle, please use Gitlab to
+contact us. For security-sensitive issues, please remember to check the
+"This issue is confidential and should only be visible to team members with at
+least Reporter access" option when filing the issue.
+{%- endtrans %}</div>
+<div><a href="https://i2pgit.org/i2p-hackers/i2p-jpackage-mac/issues">{% trans -%}Gitlab Repository{%- endtrans %}</a></div>
+
+{% endblock %}

i2p2www/pages/downloads/macros

@@ -1,16 +1,16 @@
-{% set i2pinstall_windows_hash = '817d52ea7662ef22a6158d62431aee44b8effe26d3883d979bbc72dac02a80d6' %}
-{% set i2pinstall_jar_hash     = '5dd5c300d3d2ca4eb7f7b33a2d4c9e54814f02c199c5176db17f214c8ab655d2' %}
-{% set i2psource_hash          = 'e8c55b17b2066d8eab82bc407128f1f0366530c5429a1413ea0cbf40f922d532' %}
-{% set i2pupdate_hash          = '4dac576536b4eaff5b4e8ff0e49d42bb2ff5167f6ead680b751c1bd2df7336c1' %}
-{% set i2p_android_hash        = '0c6ecb1b79773940bae270753dada8d32a7fc5c66a5536cdf6d45ec683a2896b' %}
-{% set i2p_macnative_hash      = '70447e8a352654afd940cfc6c05f094732de7ab05db7c42c173e49f37259d601' %}
+{% set i2pinstall_windows_hash = '738b7608d7f2c6433dcde8a1cbd7ea025d281e90b45c8695385004625a4c88d1' %}
+{% set i2pinstall_jar_hash     = 'ee49cad06fd73e75ed25eaab342f8167e447b901205ee8593a31b5a599d892af' %}
+{% set i2psource_hash          = '525f2ad3267f130b81296b3dd24102fdcf2adf098d54272da4e1be4abd87df04' %}
+{% set i2pupdate_hash          = '3379fe757eecbf20688ee37685fe52f15ac04fd59e891c6a059a33d519c4ff19' %}
+{% set i2p_android_hash        = '0e6196e601b99455d03bca190f6df10d68ef1337f023edcad9ec8953362795a7' %}
+{% set i2p_macnative_hash      = '18cb22cfcc3cbe0cec150e89a394d1a35703cb508ed627ef48084b7ba7c90dde' %}
 
 {% set i2p_windows_subver = '' %}
-{% set i2p_macosx_launcher_version = '0.1.8' %}
+{% set i2p_macosx_launcher_version = '1.8.0' %}
 
-{% set i2p_android_version = '0.9.48' %}
+{% set i2p_android_version = '1.8.0' %}
 {% set i2p_android_version_kytv = '0.9.22' %}
-{% set i2p_android_version_fdroid = '0.9.47-1' %}
+{% set i2p_android_version_fdroid = '0.9.50' %}
 
 
 {% macro package_outer(type, name, icon) -%}
@@ -56,7 +56,7 @@
 {%- elif type == 'docker' -%}
   {%- set name     = _('Docker') -%}
   {%- set icon     = 'images/download/docker.png' -%}
-  {%- set filename = '' -%}
+  {%- set filename = 'Dockerfile' -%}
   {%- set hash     = 'geti2p/i2p@sha256:e622209388edc49b99d8216baa731b1f54a0634c87cd47c1739f2188891daf3a' -%}
 {%- else -%}
   {%- if type == 'mac' -%}
@@ -65,10 +65,10 @@
   {%- elif type == 'unix' -%}
     {%- set name     = 'Linux / BSD / Solaris' -%}
     {%- set icon     = 'images/download/freebsd-tux.png' -%}
+    {%- set filename = 'i2pinstall_%s.jar' -%}
+    {%- set signame  = 'i2pinstall_%s.jar.sig' -%}
+    {%- set hash     = i2pinstall_jar_hash -%}
   {%- endif -%}
-  {%- set filename = 'i2pinstall_%s.jar' -%}
-  {%- set signame  = 'i2pinstall_%s.jar.sig' -%}
-  {%- set hash     = i2pinstall_jar_hash -%}
 {%- endif -%}
 
 {%- set details = caller() -%}
@@ -76,14 +76,24 @@
     <div class="file">
     {%- if type == 'android' %}
       <!-- do not use url_for here -->
-      <a class="default" href="https://download.i2p2.de/android/current/app.apk">{% trans %}Outside I2P{% endtrans %} ({{ i2p_android_version }})</a>
-      <a class="sig" href="https://download.i2p2.de/android/current/app.apk.asc">sig</a>
+      <h3>{% trans %}Download I2P for {% endtrans %}{{name}}</h3>
+      <a class="default" href="https://download.i2p2.no/android/current/app.apk">{% trans %}Outside I2P{% endtrans %} ({{ i2p_android_version }})</a>
+      <a class="sig" href="https://download.i2p2.no/android/current/app.apk.asc">sig</a>
       <!-- do not use i2pconv here -->
       <!--<a class="default" href="http://update.killyourtv.i2p/i2p.apk">{% trans %}Inside I2P{% endtrans %} ({{ i2p_android_version_kytv }})</a> -->
       <a class="default" href="https://play.google.com/store/apps/details?id=net.i2p.android">Google Play ({{ i2p_android_version }})</a>
       <!-- <a class="default" href="https://f-droid.i2p.io/">{% trans %}Our F-Droid repository{% endtrans %} ({{ i2p_android_version }})</a> -->
       <a class="default" href="https://f-droid.org/app/net.i2p.android.router">F-Droid ({{ i2p_android_version_fdroid }})</a>
+    {% elif type == 'source' %}
+      <h3>{% trans %}Download I2P {% endtrans %}{{name}}</h3>
+      <a class="default" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(filename)) }}">
+        <span class="name">{{ ver(filename) }}</span><br />
+        <span class="mirror">{{ _('Mirror:') }} <img src="{{ url_for('static', filename='images/flags/'+def_mirror.country+'.png') }}" /> {{ def_mirror.org }}</span>
+      </a>
+      <a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver(filename)) }}">{{ _('select alternate mirror') }}</a>
+      <a class="sig" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(signame)) }}">sig</a>
     {% else %}
+      <h3>{% trans %}Download I2P for {% endtrans %}{{name}}</h3>
       <a class="default" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(filename)) }}">
         <span class="name">{{ ver(filename) }}</span><br />
         <span class="mirror">{{ _('Mirror:') }} <img src="{{ url_for('static', filename='images/flags/'+def_mirror.country+'.png') }}" /> {{ def_mirror.org }}</span>

i2p2www/pages/downloads/mirrors

@@ -1,9 +1,11 @@
-{"net": "clearnet", "protocol": "https", "domain": "launchpad.net", "path": "/i2p/trunk/%(version)s/+download/%(file)s", "org": "Launchpad", "org_url": "https://launchpad.net", "country": "us"}
+{"net": "clearnet", "protocol": "https", "domain": "files.i2p-projekt.de", "path": "/%(version)s/%(file)s", "org": "i2p-projekt", "country": "de"}
 {"net": "clearnet", "protocol": "https", "domain": "download.i2p2.de", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no", "country": "no"}
-{"net": "i2p", "protocol": "http", "domain": "whnxvjwjhzsske5yevyokhskllvtisv5ueokw6yvh6t7zqrpra2q.b32.i2p", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no"}
+#{"net": "clearnet", "protocol": "https", "domain": "launchpad.net", "path": "/i2p/trunk/%(version)s/+download/%(file)s", "org": "Launchpad", "org_url": "https://launchpad.net", "country": "us"}
+{"net": "i2p", "protocol": "http", "domain": "mgp6yzdxeoqds3wucnbhfrdgpjjyqbiqjdwcfezpul3or7bzm4ga.b32.i2p", "path": "/%(version)s/%(file)s", "org": "idk.i2p"}
 {"net": "clearnet", "protocol": "http", "domain": "download.i2p2.de", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no", "country": "no"}
 {"net": "clearnet", "protocol": "http", "domain": "download.i2p2.no", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no", "country": "no"}
-{"net": "clearnet", "protocol": "https", "domain": "dl.dropboxusercontent.com", "path": "/u/18621288/I2P/%(version)s/%(file)s", "org": "Dropbox", "country": "us"}
-{"net": "clearnet", "protocol": "https", "domain": "googledrive.com", "path": "/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/%(version)s/%(file)s", "org": "Google Drive", "country": "us"}
+{"net": "clearnet", "protocol": "https", "domain": "eyedeekay.github.io", "path": "/files/releases/%(version)s/%(file)s", "org": "idk.i2p"}
+#{"net": "clearnet", "protocol": "https", "domain": "dl.dropboxusercontent.com", "path": "/u/18621288/I2P/%(version)s/%(file)s", "org": "Dropbox", "country": "us"}
+#{"net": "clearnet", "protocol": "https", "domain": "googledrive.com", "path": "/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/%(version)s/%(file)s", "org": "Google Drive", "country": "us"}
 #{"net": "clearnet", "protocol": "http", "domain": "download.geti2p.com", "path": "/%(version)s/%(file)s", "org": "aargh", "country": "us"}
 #{"net": "clearnet", "protocol": "http", "domain": "download2.geti2p.com", "path": "/%(version)s/%(file)s", "org": "aargh", "country": "us"}

i2p2www/pages/downloads/windows.html

@@ -2,7 +2,14 @@
 {% block title %}Microsoft Windows{% endblock %}
 {% block accuratefor %}0.9.47{% endblock %}
 {% block content %}
-<h1>{{ _('Installing I2P, its dependencies, and recommended external software on Windows 10') }}</h1>
+<h1>{{ _('Separately Installing I2P, its dependencies, and recommended external software on Windows 10(The Long Way)') }}</h1>
+
+<p><strong>{% trans -%}This is the long way of installing I2P for Windows, using the IzPack based
+installer and a separate Java Virtual Machine installed on the host. If you're new to I2P, you may
+want to try the Beta installer, which requires fewer total steps and automatically configures a JVM,
+I2P, and sets up a Firefox Profile in a single step.{%- endtrans %}</strong></p>
+
+<p><strong><a href="/en/download/nsis">{% trans -%}Follow this link to the beta installer{%- endtrans %}</a></strong><p>
 
 <p>{% trans -%}This is a detailed, step-by-step guide to installing and configuring I2P, including
 all dependencies and setting up a browser, on a new Windows 10 system. Many users

i2p2www/pages/global/footer.html

@@ -17,7 +17,7 @@
 </div>
 <div id="footermenu" class="third">
   <ul>
-    <li><a href="{{ site_url('get-involved/donate') }}"><div class="footeritem"><span>{{ _('Donate') }}</span></div></a></li>
+    <li><a href="https://i2pgit.org/"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/gitlab-brands.png"><span>Gitlab</span></div></a></li>
     <li><a href="{{ site_url('get-involved') }}"><div class="footeritem"><span>{{ _('Get involved!') }}</span></div></a></li>
     <li><a href="{{ site_url('faq') }}"><div class="footeritem"><span>{{ _('FAQ') }}</span></div></a></li>
     <!--<li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="footeritem"><span>Develop</span></div></a></li>-->

i2p2www/pages/global/nav.html

@@ -39,14 +39,6 @@
               <li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
             </ul>
           </li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
-            <ul>
-              <li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>Tor</span></div></a></li>
-              <li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>Freenet</span></div></a></li>
-              {#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>GNUnet</span></div></a></li> #}
-              <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
-            </ul>
-          </li>
           <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
         </ul>
       </li>
@@ -59,7 +51,6 @@
               <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
               <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
             </ul>
           </li>
           <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('Translate I2P into more Languages') }}</span></div></a></li>
@@ -73,7 +64,6 @@
       </li>
       <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact and Team') }}</span></div></a></li>
   </ul>
-  <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
     <ul>
       <li><a href="http://{{ i2pconv('i2pforum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
@@ -101,6 +91,7 @@
       </li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Develop') }}</span></div>
         <ul>
+          <li><a href="https://i2pgit.org"><div class="menuitem"><span>{{ _('Gitlab') }}</span></div></a></li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('Docs') }}</span></div>
             <ul>
               <li><a href="{{ site_url('docs') }}"><div class="menuitem"><span>{{ _('Documentation index') }}</span></div></a></li>
@@ -151,8 +142,9 @@
                   <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li>
                 </ul>
               </li>
-              <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and Address Book') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
+              <li><a href="{{ site_url('about/restrictive-countries') }}"><div class="menuitem"><span>{{ _('Strict Countries') }}</span></div></a></li>
             </ul>
           </li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div>

i2p2www/pages/papers/anonbib.bib

@@ -32,6 +32,19 @@
 # Proposed new sections: application privacy, data anonymization, ...
 #
 
+@inproceedings {239068,
+  author = {Nguyen Phong Hoang and Sadie Doreen and Michalis Polychronakis},
+  title = {Measuring I2P Censorship at a Global Scale},
+  booktitle = {9th USENIX Workshop on Free and Open Communications on the Internet (FOCI 19)},
+  year = {2019},
+  address = {Santa Clara, CA},
+  url = {https://www.usenix.org/conference/foci19/presentation/hoang},
+  www_pdf_url = {https://www.usenix.org/system/files/foci19-paper_hoang.pdf},
+  publisher = {USENIX Association},
+  month = {August},
+  www_section = traffic,
+}
+
 @inproceedings{orignal2015,
   title = {A Transparent Implementation Of The Signature In Scheme EdDSA},
   author = {Losev, V. I.},
@@ -64,7 +77,7 @@
 
 @misc{gehl_2018,
   place={Cambridge, MA},
-  title={Weaving the dark web: a trial of legitimacy on FreeNet, Tor, and I2P},
+  title={Weaving the dark web: Legitimacy on Freenet, Tor, and I2P},
   howpublished={The MIT Press},
   author={Gehl, Robert W.},
   year={2018},
@@ -100,6 +113,20 @@
   www_pdf_url = {https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8537903},
 }
 
+@article{interconnection-between-darknets,
+  author={L. Ye and X. Yu and J. Zhao and D. Zhan and X. Du and M. Guizani},
+  journal={EEE INTERNET COMPUTING},
+  title={Interconnection between darknets},
+  year={2020},
+  month={December},
+  volume={1},
+  abstract={Tor and i2p networks are two of the most popular darknets. Both darknets have become an area of illegal activities highlighting the necessity to study and analyze them to identify and report illegal content to Law Enforcement Agencies (LEAs). This paper analyzes the connections between the Tor network and the i2p network. We created the first dataset that combines information from Tor and i2p networks. The dataset contains more than 49k darknet services. The process of building and analyzing the dataset shows that it is not possible to explore one of the networks without considering the other. Both networks work as an ecosystem and there are clear paths between them. Using graph analysis, we also identified the most relevant domains, the prominent types of services in each network, and their relations. Findings are relevant to LEAs and researchers aiming to crawl and investigate i2p and Tor networks.},
+  keywords={Tor, i2p, Darknet, Graph Analysis, Dataset},
+  doi={10.1109/MIC.2020.3037723},
+  ISSN={2169-3536},
+  www_section = comm,
+  www_pdf_url = {https://arxiv.org/pdf/2012.05003},
+}
 
 @mastersthesis{smits2018:i2p-enhanced-outproxy,
   title = {Risk Assessment for I2P With an Enhanced Outproxy Design},

i2p2www/pages/site/about/alternative-clients.html

@@ -11,7 +11,7 @@ developed by community members.
 <h2>i2pd</h2>
 <p> {% trans i2pd='http://i2pd.website' -%}
 <a href="{{ i2pd }}">i2pd</a> is a I2P client implementation in C++.
-As of early 2016, i2pd is became stable enough to be used in 
+As of early 2016, i2pd has become stable enough to be used in 
 production, and since summer 2016 it fully implements all I2P APIs.
 {%- endtrans %}</p>
 

i2p2www/pages/site/about/glossary.html

@@ -2,16 +2,80 @@
 {% block title %}{{ _('Glossary') }}{% endblock %}
 {% block content %}
 {% trans -%}
-This page lists often-used terminology when discussing I2P and cryptography.
+This table lists often-used terminology when discussing I2P and cryptography.
 {%- endtrans %}
 <table>
     <ul>
-        <li>I2P: Invisible Internet Project: a project meant to provide an anonymity layer, so user can communicate anonymously using a range of applications.</li>
-        <li>Router: The core I2P software, which routes encrypted packets on the I2P network. All routers by default participate in the network, which both helps the network and provides cover traffic for any clients or servers connecting to the I2P network through the router.</li>
-        <li>RouterIdentity: A collection of information required to communicate directly with a router, such as its IP address and listening port, public signing and encryption keys etc.</li>
-        <li>Tunnel: An anonymous communication pathway between a client or server and the I2P network. Tunnels are unidirectional, so any one client or server must have at least two Tunnels - one for inbound traffic and one for outbound traffic.</li>
-        <li>Destination: The cryptographic identity of a tunnel. These are the identities of clients and servers within the I2P network, and are analogous to the IP:port of a computer on the normal internet.</li>
-        <li>LeaseSet: A collection of information required to communicate with a client or server at a particular Destination, such as the gateways of the inbound Tunnels for that Destination.</li>
+        <li>{% trans -%}I2P: Invisible Internet Project: a project meant to
+        provide an anonymity layer, so user can communicate anonymously using a
+        range of applications.{%- endtrans %}</li>
+        <li>{% trans -%}Router: The core I2P software, which routes encrypted
+        packets on the I2P network. All routers by default participate in the
+        network, which both helps the network and provides cover traffic for any
+        clients or servers connecting to the I2P network through the
+        router.{%- endtrans %}</li>
+        <li>{% trans -%}RouterIdentity: A collection of information required to
+        communicate directly with a router, such as its IP address and listening
+        port, public signing and encryption keys etc.{%- endtrans %}</li>
+        <li>{% trans -%}Tunnel: An anonymous communication pathway between a
+        client or server and the I2P network. Tunnels are unidirectional, so any
+        one client or server must have at least two Tunnels - one for inbound
+        traffic and one for outbound traffic.{%- endtrans %}</li>
+        <li>{% trans -%}Destination: The cryptographic identity of a tunnel.
+        These are the identities of clients and servers within the I2P network,
+        and are analogous to the IP:port of a computer on the normal
+        internet.{%- endtrans %}</li>
+        <li>{% trans -%}LeaseSet: A collection of information required to
+        communicate with a client or server at a particular Destination, such as
+        the gateways of the inbound Tunnels for that
+        Destination.{%- endtrans %}</li>
+    </ul>
+</table>
+{% trans -%}This table lists definition of different networks and their components. These
+terms and the definitions provided are taken from
+<a href="https://decentpatterns.xyz/report/#key-terms">Decentralization Off The
+Shelf: 7 Maxims by Simply Secure</a>(used with permission).{%- endtrans %}
+<table>
+    <ul>
+        <li>{% trans -%}Decentralization: Network architecture that avoids
+        reliance on a single party. Encompasses peer-to-peer, blockchain,
+        federated, and distributed technologies that involve many individual
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Peer-to-Peer (p2p): Peers make a portion of their 
+        resources, such as processing power, disk storage or network bandwidth,
+        directly available to other network participants, without the need for
+        central coordination by servers or stable hosts. Popularized by
+        BitTorrent, Napster, and Bitcoin.{%- endtrans %}</li>
+        <li>{% trans -%}Federated: Federation allows separate deployments of a
+        service to communicate with each other through a common protocol, for
+        instance a mail server run by Google federates with a mail server run by
+        Microsoft when you send an email from @gmail.com to @hotmail.com.
+        Each deployment may host multiple users.{%- endtrans %}</li>
+        <li>{% trans -%}Blockchain: A distributed ledger that can record
+        transactions between multiple parties efficiently and in a verifiable
+        and permanent way.{%- endtrans %}</li>
+        <li>{% trans -%}Distributed systems: Academic topic within the
+        discipline of Computer Science which is concerned with the design of
+        computer systems that consist of many individual computers connected
+        over a network. Peer-to-peer networks and blockchains are examples of
+        distributed systems architectures.{%- endtrans %}</li>
+        <li>{% trans -%}TCP/UDP: The two foundational transport protocols used
+        on the Internet. Common protocols used to send data between two
+        computers.{%- endtrans %}</li>
+        <li>{% trans -%}DHT: Distributed hash table, used in some projects to
+        connect peers to each other by storing information in the form of
+        key-value pairs in a distributed manner.{%- endtrans %}</li>
+        <li>{% trans -%}IP address: A number of a computer or network which is
+        unique and thus can be used to address it.{%- endtrans %}</li>
+        <li>{% trans -%}WebRTC: A protocol standard for establishing connections
+        in a web browser where data passes directly between
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Hash: A number, usually displayed as a string of letters
+        and numbers. It can serve as a ‘fingerprint’ uniquely identifying
+        data.{%- endtrans %}</li>
+        <li>{% trans -%}UX: User experience, the overall experience of a person
+        using a product or a service, especially in terms of how easy it is to
+        use.{%- endtrans %}</li>
     </ul>
 </table>
 {% endblock %}

i2p2www/pages/site/about/intro.html

@@ -25,7 +25,7 @@ location and your identity.  The software ships with a router that connects you
 
 <h3>{% trans -%}About Decentralization and I2P{%- endtrans %}</h3>
 
-<p>{% trans %}The I2P network is almost completely decentralized, with exception to what are what are called "Reseed Servers," which is how you first join the network. This is to deal with the DHT ( Distributed Hash Table ) bootstrap problem. Basically, there's not a good and reliable way to get out of running at least one permanent bootstrap node that non-network users can find to get started. Once you're connected to the network, you only discover peers by building "exploratory" tunnels, but to make your initial connection, you need to get a peer set from somewhere. The reseed servers, which you can see listed on http://127.0.0.1:7657/configreseed in the Java I2P router, provide you with those peers. You then connect to them with the I2P router until you find one who you can reach and build exploratory tunnels through. Reseed servers can tell that you bootstrapped from them, but nothing else about your traffic on the I2P network.{%- endtrans %}</p>
+<p>{% trans %}The I2P network is almost completely decentralized, with exception to what are called "Reseed Servers," which is how you first join the network. This is to deal with the DHT ( Distributed Hash Table ) bootstrap problem. Basically, there's not a good and reliable way to get out of running at least one permanent bootstrap node that non-network users can find to get started. Once you're connected to the network, you only discover peers by building "exploratory" tunnels, but to make your initial connection, you need to get a peer set from somewhere. The reseed servers, which you can see listed on http://127.0.0.1:7657/configreseed in the Java I2P router, provide you with those peers. You then connect to them with the I2P router until you find one who you can reach and build exploratory tunnels through. Reseed servers can tell that you bootstrapped from them, but nothing else about your traffic on the I2P network.{%- endtrans %}</p>
 
 <h3>{% trans -%}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{%- endtrans %}</h3>
 

i2p2www/pages/site/about/media.html

@@ -1,6 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Presentations on I2P') }}{% endblock %}
-{% block lastupdated %}2020-11{% endblock %}
+{% block lastupdated %}2022-03{% endblock %}
 {% block content %}
 <p>{% trans papers=site_url('papers') -%}
 Following are links to presentations, videos, and tutorials about I2P. Links to research papers on I2P are available <a href="{{ papers }}">here</a>.
@@ -145,34 +145,6 @@ idk
 <h2>{{ _('Tutorials') }}</h2>
 <ul>
 
-<li>{% trans link='http://www.youtube.com/watch?v=5J3nh1DoRMw' -%}
-<a href="{{ link }}">I2P Windows Tutorial</a>
-(Youtube Video)
-This guide will show you how to install I2P in Windows XP.
-By <a href="http://telecomix.org/">Telecomix</a>
-{%- endtrans %}</li>
-
-<li>{% trans link='http://www.youtube.com/watch?v=QeRN2G9VW5E' -%}
-<a href="{{ link }}">I2P Debian Tutorial</a>
-(Youtube Video)
-This will guide you through how to install I2P on a Debian Linux System.
-By <a href="http://telecomix.org/">Telecomix</a>
-{%- endtrans %}</li>
-
-<li>{% trans link='http://www.youtube.com/watch?v=2ylW85vc7SA' -%}
-<a href="{{ link }}">How to set up anonymous site in I2P</a>
-(Youtube Video)
-How to set up an anonymous web site in I2P.
-By <a href="http://telecomix.org/">Telecomix</a>
-{%- endtrans %}</li>
-
-<li>{% trans link='http://www.youtube.com/watch?v=d8mvGZqVgE4' -%}
-<a href="{{ link }}">I2P Tutorial Mac OS X</a>
-(Youtube Video)
-A tutorial on how to run i2p on Mac OS X and how to connect to irc.telecomix.i2p.
-By <a href="http://telecomix.org/">Telecomix</a>
-{%- endtrans %}</li>
-
 <li>{% trans link='http://www.youtube.com/watch?v=5jv7tVVJdTQ' -%}
 <a href="{{ link }}">Felix Atari explains the basic principles of I2P</a>
 (Youtube Video)
@@ -180,25 +152,6 @@ Agent Felix Atari of the Telecomix Crypto Munitions Bureau.
 By <a href="http://telecomix.org/">Telecomix</a>
 {%- endtrans %}</li>
 
-<li>{% trans link='http://www.youtube.com/watch?v=WyN_QK-_3GA' -%}
-<a href="{{ link }}">How to get onto I2P, the anonymous P2P Darknet (Windows Install)</a>
-(Youtube Video)
-This tutorial shows how to install and configure software needed to access I2P.
-{%- endtrans %}</li>
-
-<li>{% trans link='http://www.youtube.com/watch?v=q4owyd_CaGc' -%}
-<a href="{{ link }}">How to connect to I2P</a>
-(Youtube Video)
-How to install I2P on Ubuntu.
-{%- endtrans %}</li>
-
-<li>{% trans link='http://www.irongeek.com/i.php?page=videos/i2p-darknet-software-in-linux' -%}
-<a href="{{ link }}">Installing the I2P darknet software in Linux</a>
-(Video)
-Adrian Crenshaw.
-January 2011
-{%- endtrans %}</li>
-
 <li>{% trans link='http://www.youtube.com/watch?v=NV90TRs_pGE' -%}
 <a href="{{ link }}">Short garlic routing animation</a>
 (Youtube Video)
@@ -283,13 +236,34 @@ Robert Lei, December 31, 2018
 <li>{% trans mhatta='https://medium.com/@mhatta' -%}
 <a href="{{ mhatta }}">Articles by I2P contributor Masayuki Hatta on Medium.com</a>
 2019
-{% endtrans %}
+{% endtrans %}</li>>
 
-<li>{% trans ctrl='https://medium.com/@mhatta' -%}
+<li>{% trans ctrl='https://www.ctrl.blog/entry/proxy-pac-i2p-onion.html' -%}
 <a href="{{ ctrl }}">Enabling both .onion and .i2p routing with Proxy Auto-Configuration</a>
 Daniel Aleksandersen, February 7 2019
 {%- endtrans %}</li>
 
+<li>{% trans advent='https://www.heise.de/news/Open-Source-Adventskalender-Die-Darknets-Freenet-und-I2P-6302109.html' -%}
+<a href="{{ advent }}">Open-Source-Adventskalender: Die Darknets Freenet und I2P</a>
+Stefan Mey, December 21, 2021
+{%- endtrans %}</li>
+
+<li>
+<a href="https://torrentfreak.com/i2p-the-censorship-resistant-anonymous-p2p-network-is-20-years-old-220306/">I2P: The Censorship Resistant Anonymous P2P Network is 20 Years Old</a>
+- Interview with Lance James, zlatinb, and zzz -
+TorrentFreak,
+March 6, 2022
+</li>
+
+<li>
+Network Privacy via I2P -
+Interview with idk and Sadie -
+Opt Out Podcast Season 2 Episode 10
+(<a href="https://www.buzzsprout.com/1790481/10173995-network-privacy-via-i2p-w-idk-and-sadie.mp3">mp3</a>)
+(<a href="https://www.youtube.com/watch?v=-VqXfUxVQoA">YouTube Video</a>),
+March 6, 2022
+</li>
+
 </ul>
 
 <h2>{{ _('Other') }}</h2>

i2p2www/pages/site/about/restrictive-countries.html

@@ -0,0 +1,73 @@
+{% extends "global/layout.html" %}
+{% block title %}{{ _('Strict Countries') }}{% endblock %}
+{% block content %}
+<p>{% trans -%}This implementation of I2P (the Java implementation distributed on this site)
+includes a "Strict Countries List" which we use to decide how routers should behave 
+within regions where applications like I2P may be limited by law. For example, while
+no countries that we know of prohibit using I2P, some have broad prohibitions on
+participating in routing for others. Routers that appear to be in the "Strict"
+countries will automatically be placed into "Hidden" mode.{%- endtrans %}</p>
+
+<p>{% trans -%}
+The Project relies on the research provided by civil and digital rights organizations in order
+to make decisions that offer protections for its users. In this case the ongoing research
+provided by <a href="https://freedomhouse.org/">Freedom House</a> has been referenced. General
+guidance is to include countries with a Civil Liberties (CL) score of 16 or less or an Internet
+Freedom score of 39 or less (not free).{%- endtrans %}</p>
+
+<h4>{% trans -%}Hidden Mode Summary{%- endtrans %}</h4>
+<p>{% trans -%}When a router is placed into hidden mode, three key things change about it's behavior.
+It will no longer publish a routerInfo to the NetDB, it will no longer accept
+participating tunnels, and it will reject direct connections to routers in the same
+country that it is in. These defenses make the routers more difficult to enumerate
+reliably, and prevent them from running afoul of restrictions on routing traffic for
+others.{%- endtrans %}</p>
+
+<h4>{% trans -%}Strict Countries List as of 2020{%- endtrans %}</h4>
+<pre><code>
+    /* Afghanistan */ "AF",
+    /* Azerbaijan */ "AZ",
+    /* Bahrain */ "BH",
+    /* Belarus */ "BY",
+    /* Brunei */ "BN",
+    /* Burundi */ "BI",
+    /* Cameroon */ "CM",
+    /* Central African Republic */ "CF",
+    /* Chad */ "TD",
+    /* China */ "CN",
+    /* Cuba */ "CU",
+    /* Democratic Republic of the Congo */ "CD",
+    /* Egypt */ "EG",
+    /* Equatorial Guinea */ "GQ",
+    /* Eritrea */ "ER",
+    /* Ethiopia */ "ET",
+    /* Iran */ "IR",
+    /* Iraq */ "IQ",
+    /* Kazakhstan */ "KZ",
+    /* Laos */ "LA",
+    /* Libya */ "LY",
+    /* Myanmar */ "MM",
+    /* North Korea */ "KP",
+    /* Palestinian Territories */ "PS",
+    /* Pakistan */ "PK",
+    /* Rwanda */ "RW",
+    /* Saudi Arabia */ "SA",
+    /* Somalia */ "SO",
+    /* South Sudan */ "SS",
+    /* Sudan */ "SD",
+    /* Eswatini (Swaziland) */ "SZ",
+    /* Syria */ "SY",
+    /* Tajikistan */ "TJ",
+    /* Thailand */ "TH",
+    /* Turkey */ "TR",
+    /* Turkmenistan */ "TM",
+    /* Venezuela */ "VE",
+    /* United Arab Emirates */ "AE",
+    /* Uzbekistan */ "UZ",
+    /* Vietnam */ "VN",
+    /* Western Sahara */ "EH",
+    /* Yemen */ "YE"
+</code></pre>
+<p><a href="https://i2pgit.org/i2p/i2p.i2p/">{% trans -%}If you think a country should be added to the strict countries, file an issue on the I2P gitlab.{%- endtrans %}</a></p>
+
+{% endblock %}

i2p2www/pages/site/about/software.html

@@ -34,19 +34,19 @@ SusiMail is bridged so it can send and receive email from the internet as well.
 Occasionally you may see some services like Gmail classifying it as spam, which 
 you can correct in your Internet email service providers settings.{%- endtrans %}</p>
 <p>{% trans bittorrent=site_url('docs/applications/bittorrent') -%}<strong><a href="{{ bittorrent }}">I2PSnark</a></strong>: Snark is an I2P network only BitTorrent client. It never makes a connection to a peer over any other network.{%- endtrans %}</p>
-<p>{% trans addressbook=site_url('docs/naming') -%}<strong><a href="{{ addressbook }}">The AddressBook</a></strong>: This is a locally-defined list of 
+<p>{% trans addressbook=site_url('docs/naming') -%}<strong><a href="{{ addressbook }}">The Address Book</a></strong>: This is a locally-defined list of 
 human-readable addresses ( ie: i2p-projekt.i2p) and corresponding I2P addresses.(udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p) It integrates with other applications to 
 allow you to use those human-readable addresses in place of those I2P 
 addresses. It is more similar to a hosts file or a contact list than a network 
 database or a DNS service. There is no recognized global namespace, you decide 
 what any given .i2p domain maps to in the end.{%- endtrans %}</p>
-<p><strong>The QR Code Generator</strong>: Besides the Addressbook, I2P 
+<p><strong>The QR Code Generator</strong>: Besides the Address Book, I2P 
 addresses can be shared by converting them into QR codes and scanning them with 
 a camera. This is especially useful for Android devices.</p>
 <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}<strong><a href="{{ i2ptunnel }}">I2P Hidden Services Manager</a></strong> This is a general-purpose 
 adapter for forwarding services ( ie SSH ) into I2P and proxying client 
 requests to and from I2P. It provides a variety of “Tunnel Types” which are 
-able able to do advance filtering of traffic before it reaches I2P.{%- endtrans %}</p>
+able to do advance filtering of traffic before it reaches I2P.{%- endtrans %}</p>
 <h3>{% trans %}Applications Outside I2P to use with I2P{%- endtrans %}</h3>
 <p>{% trans browser=site_url('about/browser-config') %}<strong><a href="{{ browser }}">Mozilla Firefox</a></strong>: A web browser with advanced privacy and 
 security features, this is the best browser to configure to browse I2P 

i2p2www/pages/site/about/team.html

@@ -91,6 +91,16 @@ network.
 	<td valign="top" class="blue">[{{ _('vacant') }}]</td>
 	<td valign="top"><i>{{ _('threat model / crypto expert') }}</i></td>
 </tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/">Gitlab</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project gitlab') }}</i></td>
+</tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/dashboard/issues">Issue Tracker(Replaces Trac)</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
+</tr>
 <tr>
 	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
 	<td valign="top">Meeh</td>

i2p2www/pages/site/comparison/index.html

@@ -30,9 +30,9 @@ The following are discussed on the <a href="{{ othernetworks }}">other networks
   <li>Haystack</li>
 </ul>
 
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 The content of this page is subject to update, discussion and dispute, and we welcome comments and additions.
-You may contribute an analysis by entering a <a href="{{ trac }}">new ticket on Trac</a>.
+You may contribute an analysis by entering a <a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 {% endblock %}

i2p2www/pages/site/comparison/other-networks.html

@@ -14,12 +14,12 @@ The following networks are discussed on this page.
 <li>Haystack</li>
 </ul>
 
-<p>{% trans comparison=site_url('comparison'), trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans comparison=site_url('comparison'), trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 Most of the following sections are fairly old, and may not be accurate.
 For an overview of available comparisons, see the
 <a href="{{ comparison }}">main network comparisons page</a>.
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 
@@ -246,15 +246,15 @@ I2P is, of course, open source. However, that source, and our
 {%- endtrans %}</p>
 
 <h2>{{ _('Paid VPN Services') }}</h2>
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 <h2>{{ _('Others') }}</h2>
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 

i2p2www/pages/site/contact.html

@@ -9,7 +9,7 @@ For contact specific to research, outreach and security please use:
 <ul>
 <li>press _at_ geti2p.net - Press contact
 <br>
-GPG Key fingerprint: <tt>8736 C702 E83E E8A6 D2F1  6CF3 7EB8 9548 0027 B05F</tt>
+GPG Key fingerprint: <tt>48C7 AAAB 0B9E 4FE3 9535  9EBE 4B05 8F7D 13F6 E886</tt>
 <br>
 </li>
 <li>security _at_ geti2p.net - Vulnerability disclosure
@@ -161,12 +161,17 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
 	<td valign="top"><i>{{ _('threat model / crypto expert') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
-	<td valign="top">Meeh</td>
+	<td valign="top"><b><a href="https://i2pgit.org/">Gitlab</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project gitlab') }}</i></td>
+</tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/dashboard/issues">Issue Tracker(Replaces Trac)</a> admin</b></td>
+	<td valign="top">idk</td>
 	<td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> webserver admin</b></td>
+	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a>backup webserver admin</b></td>
 	<td valign="top">Meeh</td>
 	<td valign="top"><i>{{ _('manage the public project webservers') }}</i></td>
 </tr>
@@ -471,4 +476,13 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
 </tr>
 </table>
 
+<h2>{{ _('Inclusion') }}</h2>
+<p>{% trans -%}
+I2P welcomes all kinds of people, as long as they are friendly and helpful to each other.<br>
+We disgrace hate, anger, racism, and bad speaking towards anyone.<br>
+We do support LBGT, suppressed minorites and other people, wether they need help in kind of our I2P software or not.<br>
+We work together to build a free world without hate, racism and violence.<br>
+The I2P router software was created in this spirit and should be used to help repressed people to regain their freedom of speech, while not suppressing others.
+{%- endtrans %}</p>
+
 {% endblock %}

i2p2www/pages/site/docs/api/bob.html

@@ -213,7 +213,7 @@ C       A       OK Bye!
 
 <p>{% trans -%}
 Now all we need to do is telnet into 127.0.0.1, port 37337,
-send the destination key or host address from addressbook we want to contact.
+send the destination key or host address from address book we want to contact.
 In this case, we want to contact "mouth", all we do is paste in the
 key and it goes.
 {%- endtrans %}</p>

i2p2www/pages/site/docs/api/datagrams.html

@@ -23,7 +23,7 @@ either protocol may be carried by either transport.
 {%- endtrans %}</p>
 
 <h2>{% trans %}Application Guide{% endtrans %}</h2>
-<p>{% trans url='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/datagram/package-summary.html',
+<p>{% trans url='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/datagram/package-summary.html',
 sam= site_url('docs/api/sam'),
 socks=site_url('docs/api/socks') -%}
 Applications written in Java may use the 
@@ -70,7 +70,7 @@ Applications may add 'from' and 'to' ports to the I2CP (gzip) header as describe
 the <a href="{{ i2cp }}#format">I2CP page</a>.
 {%- endtrans %}</p>
 
-<p>{% trans i2psession='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/I2PSession.html' -%}
+<p>{% trans i2psession='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/I2PSession.html' -%}
 There is no method within the datagram API to specify whether it is non-repliable (raw)
 or repliable. The application should be designed to expect the appropriate type.
 The I2CP protocol number or port should be used by the application to
@@ -88,8 +88,8 @@ PROTO_DATAGRAM = 17
 PROTO_DATAGRAM_RAW = 18
 </li></ul>
 
-<p>{% trans i2psession='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/I2PSession.html',
-i2psessionmuxed='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/I2PSessionMuxedImpl.html' -%}
+<p>{% trans i2psession='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/I2PSession.html',
+i2psessionmuxed='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/I2PSessionMuxedImpl.html' -%}
 The protocols and ports may be set in I2CP's
 <a href="{{ i2psession }}">I2PSession API</a>,
 as implemented in

i2p2www/pages/site/docs/api/i2pcontrol.html

@@ -1,6 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('I2PControl - Remote Control Service') }}{% endblock %}
-{% block lastupdated %}February 2018{% endblock %}
+{% block lastupdated %}2022-01{% endblock %}
+{% block accuratefor %}0.9.52{% endblock %}
 {% block content %}
 <p>{% trans itoopie='http://'+i2pconv('itoopie.i2p')+'/' -%}
 I2P enables a <a href="http://en.wikipedia.org/wiki/JSON-RPC">JSONRPC2</a> interface via the plugin <a href="{{ itoopie }}">I2PControl</a>.
@@ -117,8 +118,15 @@ Parameters are only provided in a named way (maps).
 		<li>Token &ndash; [String] {% trans %}Token used for authenticating the client. Is provided by the server via the 'Authenticate' RPC method.{% endtrans %}</li>
 	</ul>
 	<ul>{{ _('Response:') }}
-		<li>**i2p.router.status &ndash; [String] {% trans %}What the status of the router is.{% endtrans %}</li>
-		<li>**i2p.router.uptime &ndash; [long] {% trans %}What the uptime of the router is in ms.{% endtrans %}</li>
+		<li>**i2p.router.status &ndash; [String] {% trans %}What the status of the router is.{% endtrans %}
+                	A free-format, translated string intended for display to the user.
+			May include information such as whether the router is accepting participating tunnels.
+			Content is implementation-dependent.
+		</li>
+		<li>**i2p.router.uptime &ndash; [long] {% trans %}What the uptime of the router is in ms.{% endtrans %}
+			Note: i2pd routers prior to version 2.41 returned this value as a string.
+			For compatibility, clients should handle both string and long.
+		</li>
 		<li>**i2p.router.version &ndash; [String] {% trans %}What version of I2P the router is running.{% endtrans %}</li>
 		<li>**i2p.router.net.bw.inbound.1s &ndash; [double] {% trans %}The 1 second average inbound bandwidth in Bps.{% endtrans %}</li>
 		<li>**i2p.router.net.bw.inbound.15s &ndash; [double] {% trans %}The 15 second average inbound bandwidth in Bps.{% endtrans %}</li>
@@ -145,7 +153,7 @@ Parameters are only provided in a named way (maps).
 		</li>
 		<li>**i2p.router.net.tunnels.participating &ndash; [long] {% trans %}How many tunnels on the I2P net are we participating in.{% endtrans %}</li>
 		<li>**i2p.router.netdb.activepeers &ndash; [long] {% trans %}How many peers have we communicated with recently.{% endtrans %}</li>
-		<li>**i2p.router.netdb.fastpeers &ndasg; [long] {% trans %}How many peers are considered 'fast'.{% endtrans %}</li>
+		<li>**i2p.router.netdb.fastpeers &ndash; [long] {% trans %}How many peers are considered 'fast'.{% endtrans %}</li>
 		<li>**i2p.router.netdb.highcapacitypeers &ndash; [long] {% trans %}How many peers are considered 'high capacity'.{% endtrans %}</li>
 		<li>**i2p.router.netdb.isreseeding &ndash; [boolean] {% trans %}Is the router reseeding hosts to its NetDB?{% endtrans %}</li>
 		<li>**i2p.router.netdb.knownpeers &ndash; [long] {% trans %}How many peers are known to us (listed in our NetDB).{% endtrans %}</li>
@@ -189,6 +197,10 @@ Parameters are only provided in a named way (maps).
 		<li>Token &ndash; [String] {% trans %}Token used for authenticating the client. Is provided by the server via the 'Authenticate' RPC method. If null is submitted, current setting will be returned.{% endtrans %}</li>
 	</ul>
 	<ul>{{ _('Response:') }}
+		<li>
+			Note: i2pd routers prior to version 2.41 returned some of these values as numbers.
+			For compatibility, clients should handle both strings and numbers.
+		</li>
 		<li>**i2p.router.net.ntcp.port &ndash; [String] {% trans %}If requested, returns the port used for the TCP transport.{% endtrans %}</li>
 		<li>**i2p.router.net.ntcp.hostname &ndash; [String] {% trans %}If requested, returns the hostname used for the TCP transport.{% endtrans %}</li>
 		<li>**i2p.router.net.ntcp.autoip &ndash; [String] {% trans %}If requested, returns the method used for automatically detecting ip for the TCP transport.{% endtrans %}</li>

i2p2www/pages/site/docs/api/ministreaming.html

@@ -4,7 +4,7 @@
 
 <h2>{% trans %}Note{% endtrans %}</h2>
 
-<p>{% trans streaming=site_url('docs/api/streaming'), api='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/package-summary.html' -%}
+<p>{% trans streaming=site_url('docs/api/streaming'), api='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/package-summary.html' -%}
 The ministreaming library has been enhanced and extended by the
 "full" <a href="{{ streaming }}">streaming library</a>.
 Ministreaming is deprecated and is incompatible with today's applications.
@@ -42,7 +42,7 @@ messages sent (or include any application level ACK or SACK), so it must wait
 on average twice the time it takes to send a message before sending another.
 {%- endtrans %}</p>
 
-<p>{% trans api='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/package-summary.html',
+<p>{% trans api='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/package-summary.html',
 samv3=site_url('docs/api/samv3') -%}
 Even with those issues, the ministreaming library performs quite well in many
 situations, and its <a href="{{ api }}">API</a>

i2p2www/pages/site/docs/api/sam.html

@@ -389,7 +389,7 @@ followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_Priv
 followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_SigningPrivateKey">Signing Private Key</a>,
 which is 884 or more base 64 characters (663 or more bytes in binary),
 depending on signature type.
-The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 ----------------------------------------------------------------------
 RESULT values

i2p2www/pages/site/docs/api/samv2.html

@@ -446,7 +446,7 @@ followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_Priv
 followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_SigningPrivateKey">Signing Private Key</a>,
 which is 884 or more base 64 characters (663 or more bytes in binary),
 depending on signature type.
-The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 ----------------------------------------------------------------------
 RESULT values

i2p2www/pages/site/docs/api/samv3.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}SAM V3{% endblock %}
-{% block lastupdated %}2020-11{% endblock %}
-{% block accuratefor %}0.9.48{% endblock %}
+{% block lastupdated %}2022-06{% endblock %}
+{% block accuratefor %}1.8.0{% endblock %}
 {% block content %}
 <p>SAM is a simple client protocol for interacting with I2P.
 SAM is the recommended protocol for non-Java applications to connect to the I2P network,
@@ -18,9 +18,9 @@ Alternatives:
 <a href="streaming">Streaming</a>,
 <a href="{{ site_url('docs/protocol/i2cp') }}">I2CP</a>,
 <a href="{{ site_url('docs/api/bob') }}">BOB (deprecated)</a>.
-Older versions:
+Deprecated versions:
 <a href="{{ site_url('docs/api/sam') }}">SAM V1</a>,
-<a href="{{ site_url('docs/api/samv2') }}">SAM V2</a>,
+<a href="{{ site_url('docs/api/samv2') }}">SAM V2</a>
 </p>
 
 <h2>Known SAM libraries</h2>
@@ -67,7 +67,7 @@ Older versions:
 <tr class="odd">
 <td>sam3</td>
 <td>Go</td>
-<td>3.2</td>
+<td>3.3</td>
 <td>yes</td>
 <td>yes</td>
 <td>yes</td>
@@ -137,6 +137,15 @@ Older versions:
 <td><a href="https://github.com/solatis/haskell-network-anonymous-i2p">github.com/solatis/haskell-network-anonymous-i2p</a></td>
 </tr>
 <tr class="odd">
+<td>i2p-sam</td>
+<td>Javascript</td>
+<td>3.1</td>
+<td>yes</td>
+<td>no</td>
+<td>yes</td>
+<td><a href="https://codeberg.org/diva.exchange/i2p-sam">https://codeberg.org/diva.exchange/i2p-sam</a></td>
+</tr>
+<tr class="even">
 <td>node-i2p</td>
 <td>Javascript</td>
 <td>3.0</td>
@@ -145,7 +154,7 @@ Older versions:
 <td>unk</td>
 <td><a href="https://github.com/redhog/node-i2p">github.com/redhog/node-i2p</a></td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td>Jsam</td>
 <td>Java</td>
 <td>3.1</td>
@@ -154,7 +163,7 @@ Older versions:
 <td>no</td>
 <td><a href="https://github.com/eyedeekay/Jsam">github.com/eyedeekay/Jsam</a></td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td>i2pdotnet</td>
 <td>.Net</td>
 <td>3.0</td>
@@ -163,7 +172,7 @@ Older versions:
 <td>unk</td>
 <td><a href="https://github.com/SamuelFisher/i2pdotnet">github.com/SamuelFisher/i2pdotnet</a></td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td>i2p.rb</td>
 <td>Ruby</td>
 <td>3.0</td>
@@ -172,10 +181,44 @@ Older versions:
 <td>no</td>
 <td><a href="https://github.com/dryruby/i2p.rb">github.com/dryruby/i2p.rb</a></td>
 </tr>
+<tr class="even">
+<td>solitude</td>
+<td>Rust</td>
+<td>3.1</td>
+<td>WIP</td>
+<td>WIP</td>
+<td>WIP</td>
+<td><a href="https://github.com/syvita/solitude">github.com/syvita/solitude</a></td>
+</tr>
+<tr class="odd">
+<td>i2pSAM-Qt</td>
+<td>C++</td>
+<td>3.1</td>
+<td>yes</td>
+<td>yes</td>
+<td>yes</td>
+<td><a href="https://notabug.org/acetone/i2pSAM-Qt">notabug.org/acetone/i2pSAM-Qt</a></td>
+</tr>
 </tbody>
 </table>
 
 
+<h2>Quick Start</h2>
+<p>
+To implement a basic TCP-only, peer-to-peer application, the client must support the following commands.
+<ul>
+<li> HELLO VERSION MIN=3.1 MAX=3.1 <br> Needed for all of the remaining ones
+<li> DEST GENERATE SIGNATURE_TYPE=7 <br> To generate our private key and destination
+<li> NAMING LOOKUP NAME=... <br> To convert .i2p addresses to destinations
+<li> SESSION CREATE STYLE=STREAM ID=... DESTINATION=... <br> Needed for STREAM CONNECT and STREAM ACCEPT
+<li> STREAM CONNECT ID=... DESTINATION=... <br> To make outgoing connections
+<li> STREAM ACCEPT ID=... <br> To accept incoming connections
+</ul>
+
+
+
+
+
 <h2>Version 3 Changes</h2>
 <h3>Version 3.0 Changes</h3>
 <p>
@@ -499,7 +542,7 @@ followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_Sign
 optionally followed by the <a href="{{ site_url('docs/spec/common-structures') }}#struct_OfflineSignature">Offline Signature</a>,
 which is 663 or more bytes in binary and 884 or more bytes in base 64,
 depending on signature type.
-The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 </p><p>
 If the signing private key is all zeros, the
@@ -562,7 +605,7 @@ followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_Sign
 optionally followed by the <a href="{{ site_url('docs/spec/common-structures') }}#struct_OfflineSignature">Offline Signature</a>,
 which is 663 or more bytes in binary and 884 or more bytes in base 64,
 depending on signature type.
-The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 </p><p>
 If the SESSION CREATE contained a signing private key of all zeros and
@@ -652,6 +695,11 @@ whose ID is $nickname to the specified peer.
 The target is $destination, which is the base 64 of the <a href="{{ site_url('docs/spec/common-structures') }}#type_Destination">Destination</a>,
 which is 516 or more base 64 characters (387 or more bytes in binary),
 depending on signature type.
+<b>NOTE:</b>
+Since about 2014 (SAM v3.1), Java I2P has also supported hostnames and b32 addresses for the $destination, but this was previously undocumented.
+Hostnames and b32 addresses are now officially supported by Java I2P as of release 0.9.48.
+The i2pd router will support hostnames and b32 addresses as of release 2.38.0 (0.9.50).
+For both routers, "b32" support includes support extended "b33" addresses for blinded destinations.
 </p>
 
 <h4>Connect Response</h4>
@@ -883,8 +931,41 @@ soon as the "forwarding" socket is closed.
 
 
 
+<h3>SAM Datagrams</h3>
+<p>
+SAMv3 provides mechanisms to send and receive datagrams over local datagram sockets.
+Some SAMv3 implementations also support the older v1/v2 way of sending/receiving
+datagrams over the SAM bridge socket. Both are documented below.
+</p><p>
+I2P supports two types of datagrams:
+</p>
+<ul><li>
+"Repliable" datagrams are prefixed with the destination of the sender,
+and contain the signature of the sender, so the receiver
+may verify that the sender's destination was not spoofed,
+and may reply to the datagram.
+</li><li>
+"Raw" datagrams do not contain the destination of the sender or a signature.
+</li></ul>
+<p>
+Default I2CP ports are defined for both repliable and raw datagrams.
+The I2CP port may be changed for raw datagrams.
+</p><p>
+A common protocol design pattern is for repliable datagrams to be sent
+to servers, with some identifier included, and the server to
+respond with a raw datagram that includes that indentifier,
+so the response may be correlated with the request.
+This design pattern eliminates the substantial overhead of repliable datagrams
+in replies.
+All choices of I2CP protocols and ports are application-specific,
+and designers should take these issues into consideration.
+</p><p>
+See also the important notes on datagram MTU in the section below.
+</p>
 
-<h3 id="v3dgsend">SAM Datagrams : Sending Repliable or Raw Datagrams</h3>
+
+
+<h4 id="v3dgsend">Sending Repliable or Raw Datagrams</h4>
 <p>
 While I2P doesn't inherently contain a FROM address, for ease of use
 an additional layer is provided as repliable datagrams - unordered
@@ -937,6 +1018,10 @@ This is all on one line (space separated), shown on multiple lines for clarity:
  The target is $destination, which is the base 64 of the <a href="{{ site_url('docs/spec/common-structures') }}#type_Destination">Destination</a>,
    which is 516 or more base 64 characters (387 or more bytes in binary),
    depending on signature type.
+  <b>NOTE:</b>
+  Since about 2014 (SAM v3.1), Java I2P has also supported hostnames and b32 addresses for the $destination, but this was previously undocumented.
+  Hostnames and b32 addresses are now officially supported by Java I2P as of release 0.9.48.
+  The i2pd router does not currently support hostnames and b32 addresses; support may be added in a future release.
 </li><li>
  All options are per-datagram settings that override the defaults specified in the SESSION CREATE.
 </li><li>
@@ -955,7 +1040,7 @@ data of the message to the specified destination.
 For an alternate method of sending repliable and raw datagrams, see <a href="#dgsend">DATAGRAM SEND and RAW SEND</a>.
 </p>
 
-<h3>SAM Repliable Datagrams : Receiving a Datagram</h3>
+<h4>SAM Repliable Datagrams : Receiving a Datagram</h4>
 <p>
 Received datagrams are written by SAM on the socket from which the
 datagram session was opened, if a forwarding PORT is not specified in the SESSION CREATE
@@ -986,7 +1071,8 @@ or other fields, merely the data that the sender provided.  This
 continues until the session is closed (by the client dropping the
 connection).
 
-<h3>SAM Datagrams : Forwarding Raw or Repliable Datagrams</h3>
+
+<h4>Forwarding Raw or Repliable Datagrams</h4>
 <p>
 When creating a datagram session, the client can ask SAM to forward
 incoming messages to a specified ip:port. It does so by issuing the
@@ -1012,7 +1098,7 @@ CREATE command with PORT and HOST options:
    optionally followed by the <a href="{{ site_url('docs/spec/common-structures') }}#struct_OfflineSignature">Offline Signature</a>,
    which is 884 or more base 64 characters (663 or more bytes in binary),
    depending on signature type.
-   The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+   The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 </p><p>
 Offline signatures are only supported for RAW datagrams.
@@ -1076,7 +1162,7 @@ depending on signature type.
 </p>
 
 
-<h3>SAM Anonymous (Raw) Datagrams</h3>
+<h4>SAM Anonymous (Raw) Datagrams</h4>
 <p>
 Squeezing the most out of I2P's bandwidth, SAM allows clients to send
 and receive anonymous datagrams, leaving authentication and reply
@@ -1136,7 +1222,30 @@ the forwarded raw datagram will be prepended with a header line as follows:
 For an alternate method of sending anonymous datagrams, see <a href="#dgsend">RAW SEND</a>.
 </p>
 
-<h3 id="dgsend">DATAGRAM SEND, RAW SEND (V1/V2 Compatible Datagram Handling)</h3>
+
+<h4>V3 Datagram MTU Considerations</h4>
+<p>
+I2P Datagrams may be larger than the typical internet MTU of 1500.
+Locally sent datagrams and forwarded repliable datagrams
+prefixed with the 516+ byte base64 destination are likely to exceed that MTU.
+However, localhost MTUs on Linux systems are typically much larger,
+for example 65536. Localhost MTUs will vary by OS.
+I2P Datagrams will never be larger than 65536.
+Datagram size is dependent on the application protocol.
+</p><p>
+If the SAM client is local to the SAM server and the system supports
+a larger MTU, then the datagrams will not be fragmented locally.
+However, if the SAM client is remote, then IPv4 datagrams would
+be fragmented and IPv6 datagrams would fail (IPv6 does not support UDP fragmentation).
+</p><p>
+Client library and application developers should be aware of these issues
+and document recommendations to avoid fragmentation and
+prevent packet loss, especially on remote SAM client-server connections.
+</p>
+
+
+
+<h4 id="dgsend">DATAGRAM SEND, RAW SEND (V1/V2 Compatible Datagram Handling)</h4>
 <p>
 In SAM V3, the preferred way to send datagrams is via the datagram socket
 at port 7655 as documented above. However, repliable datagrams may be sent
@@ -1160,7 +1269,7 @@ sent to the most recently created DATAGRAM- or RAW-style session,
 as appropriate. Support for the ID parameter may be added in a future release.
 
 
-<h3 id="primary">PRIMARY Sessions (V3.3 and higher)</h3>
+<h3 id="primary">SAM PRIMARY Sessions (V3.3 and higher)</h3>
 
 <p><i>
 Version 3.3 was introduced in I2P release 0.9.25.
@@ -1394,7 +1503,7 @@ followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_Priv
 followed by the <a href="{{ site_url('docs/spec/common-structures') }}#type_SigningPrivateKey">Signing Private Key</a>,
 which is 884 or more base 64 characters (663 or more bytes in binary),
 depending on signature type.
-The binary format is specified in <a href="http://{{ i2pconv('echelon.i2p/javadoc') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
+The binary format is specified in <a href="http://{{ i2pconv('idk.i2p/javadoc-i2p') }}/net/i2p/data/PrivateKeyFile.html">Private Key File</a>.
 
 </p><p>
 DEST GENERATE does not require that a session has been created first.
@@ -1508,7 +1617,14 @@ SAM SESSION CREATE line.
 </p><p>
 All sessions may include <a href="{{ site_url('docs/protocol/i2cp') }}#options">I2CP options such as tunnel lengths</a>.
 STREAM sessions may include <a href="{{ site_url('docs/api/streaming') }}#options">Streaming library options</a>.
+</p><p>
 See those references for option names and defaults.
+The referenced documention is for the Java router implementation.
+Defaults are subject to change.
+Option names and values are case-sensitive.
+Other router implementations may not support all options and may have different defaults;
+consult router documentation for details.
+</p>
 
 
 <h3>BASE 64 Notes</h3>
@@ -1517,12 +1633,6 @@ See those references for option names and defaults.
 Base 64 encoding must use the I2P standard Base 64 alphabet "A-Z, a-z, 0-9, -, ~".
 </p>
 
-<h3>Client Library Implementations</h3>
-<p>
-Client libraries are available for C, C++, C#, Perl, and Python.
-These are in the apps/sam/ directory in the <a href="{{ get_url('downloads_list') }}">I2P Source Package</a>.
-Some may be older and have not been updated for SAMv3 support.
-</p>
 
 <h3>Default SAM Setup</h3>
 <p>

i2p2www/pages/site/docs/api/socks.html

@@ -47,7 +47,7 @@ work that simply using the existing I2P APIs.
 
 <p>{% trans -%}
 The SOCKS proxy
-supports standard addressbook names, but not Base64 destinations.
+supports standard address book names, but not Base64 destinations.
 Base32 hashes should work as of release 0.7.
 It supports outgoing connections only, i.e. an I2PTunnel Client.
 UDP support is stubbed out but not working yet.

i2p2www/pages/site/docs/api/streaming.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Streaming Library{% endtrans %}{% endblock %}
-{% block lastupdated %}2020-05{% endblock %}
-{% block accuratefor %}0.9.46{% endblock %}
+{% block title %}{% trans %}Streaming Protocol{% endtrans %}{% endblock %}
+{% block lastupdated %}2022-04{% endblock %}
+{% block accuratefor %}0.9.53{% endblock %}
 {% block content %}
 <h2>{% trans %}Overview{% endtrans %}</h2>
 
@@ -65,11 +65,11 @@ streaming library, to be interpreted by I2CP.
 {%- endtrans %}</p>
 
 <p>{% trans i2cp=site_url('docs/protocol/i2cp'),
-i2psktmf='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/I2PSocketManagerFactory.html',
-i2psktm='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/I2PSocketManager.html',
-i2psess='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/I2PSession.html',
-i2pskt='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/I2PSocket.html',
-i2psskt='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/I2PServerSocket.html' -%}
+i2psktmf='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/I2PSocketManagerFactory.html',
+i2psktm='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/I2PSocketManager.html',
+i2psess='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/I2PSession.html',
+i2pskt='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/I2PSocket.html',
+i2psskt='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/I2PServerSocket.html' -%}
 The standard interface to the streaming lib is for the application to use the
 <a href="{{ i2psktmf }}">I2PSocketManagerFactory</a> to create an
 <a href="{{ i2psktm }}">I2PSocketManager</a>. The application then asks the
@@ -79,7 +79,7 @@ can then setup connections with an <a href="{{ i2pskt }}">I2PSocket</a> or
 receive connections with an <a href="{{ i2psskt }}">I2PServerSocket</a>.
 {%- endtrans %}</p>
 
-<p>{% trans url='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/package-summary.html' -%}
+<p>{% trans url='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/package-summary.html' -%}
 Here are the <a href="{{ url }}">full streaming library Javadocs</a>.
 {%- endtrans %}</p>
 
@@ -89,7 +89,7 @@ For a good example of usage, see the i2psnark code.
 
 
 <h3 id="options">{% trans %}Options and Defaults{% endtrans %}</h3>
-<p>{% trans i2psktmf='http://'+i2pconv('echelon.i2p/javadoc')+'/net/i2p/client/streaming/I2PSocketManagerFactory.html' -%}
+<p>{% trans i2psktmf='http://'+i2pconv('idk.i2p/javadoc-i2p')+'/net/i2p/client/streaming/I2PSocketManagerFactory.html' -%}
 The options and current default values are listed below.
 Options are case-sensitive and may be set for the whole router, for a particular client, or for an individual socket on a
 per-connection basis.