1.6.1

Tunnels: Fix NPE in BuildHandler
1.6.0
2021-11-29 12:21:54 -05:00 · 2021-11-29 12:19:02 -05:00 · 2021-11-29 10:41:18 -05:00 · 2021-11-29 10:31:55 -05:00 · 2021-11-27 08:52:30 -05:00 · 2021-11-27 08:05:57 -05:00
345 changed files with 52504 additions and 51142 deletions
--- a/.tx/config
+++ b/.tx/config
@ -96,6 +96,7 @@ trans.pt = core/locale/messages_pt.po
 trans.pt_BR = core/locale/messages_pt_BR.po
 trans.ro = core/locale/messages_ro.po
 trans.ru_RU = core/locale/messages_ru.po
+trans.sl = core/locale/messages_sl.po
 trans.sv_SE = core/locale/messages_sv.po
 trans.tk = core/locale/messages_tk.po
 trans.tr_TR = core/locale/messages_tr.po
@ -133,6 +134,7 @@ trans.pt = router/locale/messages_pt.po
 trans.pt_BR = router/locale/messages_pt_BR.po
 trans.ro = router/locale/messages_ro.po
 trans.ru_RU = router/locale/messages_ru.po
+trans.sl = router/locale/messages_sl.po
 trans.sv_SE = router/locale/messages_sv.po
 trans.tk = router/locale/messages_tk.po
 trans.tr_TR = router/locale/messages_tr.po
@ -206,6 +208,7 @@ trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
 trans.ro = apps/routerconsole/locale-news/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
 trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sl = apps/routerconsole/locale-news/messages_sl.po
 trans.sq = apps/routerconsole/locale-news/messages_sq.po
 trans.sr = apps/routerconsole/locale-news/messages_sr.po
 trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
@ -517,6 +520,7 @@ trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
 trans.ro = core/java/src/gnu/getopt/MessagesBundle_ro.properties
 trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
 trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
+trans.sl = core/java/src/gnu/getopt/MessagesBundle_sl.properties
 trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
 trans.sr = core/java/src/gnu/getopt/MessagesBundle_sr.properties
 trans.sv_SE = core/java/src/gnu/getopt/MessagesBundle_sv.properties
@ -550,6 +554,7 @@ trans.pt = apps/ministreaming/locale/messages_pt.po
 trans.pt_BR = apps/ministreaming/locale/messages_pt_BR.po
 trans.ro = apps/ministreaming/locale/messages_ro.po
 trans.ru_RU = apps/ministreaming/locale/messages_ru.po
+trans.sl = apps/ministreaming/locale/messages_sl.po
 trans.sv_SE = apps/ministreaming/locale/messages_sv.po
 trans.tk = apps/ministreaming/locale/messages_tk.po
 trans.tr_TR = apps/ministreaming/locale/messages_tr.po
@ -570,6 +575,7 @@ trans.de = installer/resources/locale-man/man_de.po
 trans.es = installer/resources/locale-man/man_es.po
 trans.fi = installer/resources/locale-man/man_fi.po
 trans.fr = installer/resources/locale-man/man_fr.po
+trans.hu = installer/resources/locale-man/man_hu.po
 trans.id = installer/resources/locale-man/man_id.po
 trans.it = installer/resources/locale-man/man_it.po
 trans.ko = installer/resources/locale-man/man_ko.po
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -264,7 +264,7 @@ Applications:
     Zxing 3.4.1:
       See licenses/LICENSE-Apache2.0.txt

-   Jetty 9.3.29.v20201019 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.3.30.v20211001 (jetty-*.jar, org.mortbay.*.jar):
   (not included in most distribution packages, except for jetty-i2p.jar)
   See licenses/ABOUT-Jetty.html
   See licenses/NOTICE-Jetty.html
@ -339,9 +339,9 @@ Applications:
   Systray (systray.jar):
   Public domain.

-   Tomcat 9.0.45 (jasper-runtime.jar):
+   Tomcat 9.0.54 (jasper-runtime.jar):
   (not included in most distribution packages)
-   Copyright 1999-2020 The Apache Software Foundation
+   Copyright 1999-2021 The Apache Software Foundation
   See licenses/LICENSE-Apache2.0.txt
   See licenses/NOTICE-Tomcat.txt

--- a/README.md
+++ b/README.md
@ -70,7 +70,7 @@ For more information how to run I2P in Docker, see [Docker.md](Docker.md)

 Need help? See the IRC channel #i2p on irc.freenode.net

-Bug reports: [https://trac.i2p2.de/report/1](https://trac.i2p2.de/report/1) 
+Bug reports: [https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues](https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues) [http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues](http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues)

 Contact information, security issues, press inquiries: [https://geti2p.net/en/contact](https://geti2p.net/en/contact) 

--- a/README.txt
+++ b/README.txt
@ -47,7 +47,8 @@ Need help?
 	IRC irc.freenode.net #i2p

 Bug reports:
-	https://trac.i2p2.de/report/1
+	https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues
+	http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues

 Contact information, security issues, press inquiries:
 	https://geti2p.net/en/contact
--- a/apps/desktopgui/locale/messages_ku.po
+++ b/apps/desktopgui/locale/messages_ku.po
@ -4,14 +4,15 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# Zagros <zagros21@cmail.nu>, 2020
+# Zagros, 2021
+# Zagros, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2020-09-23 21:02+0000\n"
-"Last-Translator: Zagros <zagros21@cmail.nu>\n"
+"PO-Revision-Date: 2021-08-30 21:05+0000\n"
+"Last-Translator: Zagros\n"
 "Language-Team: Kurdish (http://www.transifex.com/otf/I2P/language/ku/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -42,7 +43,7 @@ msgstr "وێبگەڕی I2P بکەوە"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:76
 #: src/net/i2p/desktopgui/InternalTrayManager.java:228
 msgid "Configure I2P System Tray"
-msgstr ""
+msgstr "دەستکاری سیستەمی ئاگەدارکردنەوەی I2P بکە"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:77
 #: src/net/i2p/desktopgui/InternalTrayManager.java:229
@ -72,7 +73,7 @@ msgstr "دەستبەجێ I2P بوەستێنە"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:157
 #: src/net/i2p/desktopgui/InternalTrayManager.java:309
 msgid "Cancel I2P Shutdown"
-msgstr "کووژاندنەوە I2P هەڵبوەشێنەوە"
+msgstr "دەستهەڵگرتن لە کووژاندنەوەی I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:363
 #, java-format
--- a/apps/desktopgui/locale/messages_sv.po
+++ b/apps/desktopgui/locale/messages_sv.po
@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2021-05-28 01:02+0000\n"
+"PO-Revision-Date: 2021-10-02 16:29+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@ -51,7 +51,7 @@ msgstr "Konfigurera I2P-meddelandefältet"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:77
 #: src/net/i2p/desktopgui/InternalTrayManager.java:229
 msgid "Disable"
-msgstr "Avaktivera"
+msgstr "Inaktivera"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:93
 #: src/net/i2p/desktopgui/InternalTrayManager.java:245
--- a/apps/i2psnark/locale/messages_ja.po
+++ b/apps/i2psnark/locale/messages_ja.po
@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-05 14:30+0000\n"
-"PO-Revision-Date: 2021-06-07 03:18+0000\n"
+"PO-Revision-Date: 2021-08-25 09:18+0000\n"
 "Last-Translator: XMPPはいいぞ\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
@ -1249,7 +1249,7 @@ msgstr "データディレクトリ"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2438
 msgid "Directory where torrents and downloaded/shared files are stored"
-msgstr "トレント及び ダウンロードされた/共有された ファイルが保存されているディレクトリ"
+msgstr "トレントと、ダウンロードした、または共有したファイルが保存されているディレクトリ"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2443
 msgid "Files readable by all"
--- a/apps/i2psnark/locale/messages_sv.po
+++ b/apps/i2psnark/locale/messages_sv.po
@ -13,7 +13,7 @@
 # hottuna <i2p@robertfoss.se>, 2011
 # hottuna <i2p@robertfoss.se>, 2013
 # hottuna <i2p@robertfoss.se>, 2011-2012
-# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017
+# Jonatan Nyberg <jonatan@autistici.org>, 2017,2021
 # Jonatan Nyberg <jonatan@autistici.org>, 2018-2021
 # efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017-2018
 # Martin Svensson <digitalmannen@gmail.com>, 2011-2012
@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-05 14:30+0000\n"
-"PO-Revision-Date: 2021-04-27 19:05+0000\n"
+"PO-Revision-Date: 2021-10-15 08:07+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@ -492,7 +492,7 @@ msgstr "Fel på torrent {0}"
 #: ../java/src/org/klomp/snark/SnarkManager.java:2933
 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
-msgstr "Öppnar I2P tunneln"
+msgstr "Öppnar I2P-tunneln"

 #: ../java/src/org/klomp/snark/SnarkManager.java:2953
 msgid "Opening the I2P tunnel and starting all torrents."
@ -504,7 +504,7 @@ msgstr "Stoppar alla torrenter och stänger I2P-tunneln."

 #: ../java/src/org/klomp/snark/SnarkManager.java:3045
 msgid "Closing I2P tunnel after notifying trackers."
-msgstr "Stänger I2P tunnel efter att ha meddelat bevakare."
+msgstr "Stänger I2P-tunnel efter att ha meddelat bevakare."

 #: ../java/src/org/klomp/snark/SnarkManager.java:3115
 #, java-format
@ -602,7 +602,7 @@ msgstr "Är du säker på att du vill radera filen  \\''{0}\\' (hämtade data ko
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
-msgstr "Är du säker på att du vill ta bort torrenten \"{0}\" och all hämtad data?"
+msgstr "Är du säker på att du vill ta bort torrenten \"{0}\" och alla hämtade data?"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:349
 msgid "Torrents"
@ -610,7 +610,7 @@ msgstr "Torrenter"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:358
 msgid "Refresh page"
-msgstr "Läs om sida"
+msgstr "Uppdatera sidan"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:379
 msgid "Click \"Add torrent\" button to fetch torrent"
@ -618,7 +618,7 @@ msgstr "Klicka på \"Lägg till torrent\" för att hämta en torrent"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:443
 msgid "clear messages"
-msgstr "rensa meddelandena"
+msgstr "rensa meddelanden"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:500
 msgid "Status"
@ -678,7 +678,7 @@ msgstr "RX"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599
 msgid "Downloaded"
-msgstr "Hämtade"
+msgstr "Hämtat"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3321
@ -744,7 +744,7 @@ msgstr "Starta alla torrenter och I2P-tunneln"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:738
 msgid "No torrents loaded."
-msgstr "Inga torrenter lästes in."
+msgstr "Inga torrenter inlästa."

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:746
 msgid "Totals"
@ -863,12 +863,12 @@ msgstr "Datafil kunde inte tas bort: {0}"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1278
 #, java-format
 msgid "Directory could not be deleted: {0}"
-msgstr "Katalogen kunde inta tas bort: {0}"
+msgstr "Mappen kunde inta tas bort: {0}"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286
 #, java-format
 msgid "Directory deleted: {0}"
-msgstr "Katalogen bort tagen: {0}"
+msgstr "Mappen bort tagen: {0}"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
 #, java-format
@ -932,7 +932,7 @@ msgstr "Ta bort valda"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2789
 msgid "Save tracker configuration"
-msgstr "Spara bevakare konfiguration"
+msgstr "Spara bevakarkonfiguration"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503
 msgid "Removed"
@ -1124,7 +1124,7 @@ msgstr "Ta bort"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1973
 msgid "Delete the .torrent file and the associated data files"
-msgstr ""
+msgstr "Ta bort .torrent-filen och tillhörande datafiler"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1977
 msgid "Delete"
@ -1165,7 +1165,7 @@ msgstr "Stryper (vi låter inte nod be om delar)"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
 #, java-format
 msgid "Details at {0} tracker"
-msgstr "Detaljer för {0} bevakare"
+msgstr "Detaljer för {0}-bevakare"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2224
 msgid "Info"
@ -1182,7 +1182,7 @@ msgstr "Adress"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2310
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, or info hash"
-msgstr ""
+msgstr "Ange webbadress för hämtning av torrentfiler (endast I2P), magnetlänk eller infohash"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2315
 msgid "Add torrent"
@ -1190,7 +1190,7 @@ msgstr "Lägg till torrent"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2319
 msgid "Data dir"
-msgstr "Datakatalog"
+msgstr "Datamapp"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322
 #, java-format
@ -1219,7 +1219,7 @@ msgstr "Data att ladda upp"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
-msgstr "Fil eller katalog att seeda (fullständig sökväg eller inom katalog {0})"
+msgstr "Fil eller mapp att distribuera (fullständig sökväg eller inom mapp {0})"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2351
 msgid "Create torrent"
@ -1268,11 +1268,11 @@ msgstr "Datamapp"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2438
 msgid "Directory where torrents and downloaded/shared files are stored"
-msgstr "Katalog var torrenter och hämtade/delade filer lagras"
+msgstr "Mapp var torrenter och hämtade/delade filer lagras"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2443
 msgid "Files readable by all"
-msgstr "Filer läsbara för alla"
+msgstr "Filer läsbara av alla"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447
 msgid ""
@ -1492,7 +1492,7 @@ msgstr "Lägg till"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2824
 #, java-format
 msgid "Invalid magnet URL {0}"
-msgstr "Ogiltig magnet-adress {0}"
+msgstr "Ogiltig magnetwebbadress {0}"

 #. * dummies for translation
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2832
@ -1555,7 +1555,7 @@ msgstr ""

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3284
 msgid "Magnet link"
-msgstr "Magnet länk"
+msgstr "Magnetlänk"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3299
 msgid "Private torrent"
@ -1588,7 +1588,7 @@ msgstr "Delstorlek"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3388
 msgid "Refresh page for results"
-msgstr "Ladda om sidan för resultat"
+msgstr "Uppdatera sidan för resultat"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3400
 msgid "Force Recheck"
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java
@ -122,10 +122,11 @@ class AccessFilter implements StatefulConnectionFilter {
        
        synchronized(knownDests) {
            knownDests.keySet().retainAll(tmp.keySet());
-            for (Hash newHash : tmp.keySet()) {
+            for (Map.Entry<Hash, DestTracker> e : tmp.entrySet()) {
+                Hash newHash = e.getKey();
                if (knownDests.containsKey(newHash)) 
                    continue;
-                knownDests.put(newHash, tmp.get(newHash));
+                knownDests.put(newHash, e.getValue());
            }    
        }
        
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@ -2,7 +2,9 @@ package net.i2p.i2ptunnel.ui;

 import java.io.File;
 import java.io.IOException;
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@ -14,6 +16,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClient;
 import net.i2p.crypto.SigType;
+import net.i2p.data.Base32;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
@ -855,8 +858,35 @@ public class GeneralHelper {
        return 0;
    }

+    /**
+     *  @return entries sorted, converted to b32, separated by newlines, or ""
+     */
    public String getAccessList(int tunnel) {
-        return getProperty(tunnel, "i2cp.accessList", "").replace(",", "\n");
+        String val = getProperty(tunnel, "i2cp.accessList", "");
+        if (val.length() > 0) {
+            // Convert B64 to B32 for display
+            String[] vals = DataHelper.split(val, ",");
+            for (int i = 0; i < vals.length; i++) {
+                String v = vals[i];
+                if (v.length() == 44) {
+                    byte[] b = Base64.decode(v);
+                    if (b != null)
+                        vals[i] = Base32.encode(b) + ".b32.i2p";
+                }
+            }
+            Arrays.sort(vals, Collator.getInstance());
+            StringBuilder buf = new StringBuilder(val.length() * 3 / 2);
+            for (int i = 0; i < vals.length; i++) {
+                String v = vals[i];
+                if (v.length() == 0)
+                    continue;
+                buf.append(vals[i]);
+                if (i != vals.length - 1)
+                    buf.append('\n');
+            }
+            val = buf.toString();
+        }
+        return val;
    }

    /**
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@ -19,6 +19,7 @@ import net.i2p.crypto.EncType;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.crypto.KeyPair;
 import net.i2p.crypto.SigType;
+import net.i2p.data.Base32;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
@ -466,8 +467,27 @@ public class TunnelConfig {
    }

    public void setAccessList(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.accessList", val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
+        if (val != null) {
+            val = val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ",");
+            // Convert to B64 to save space
+            String[] vals = DataHelper.split(val, ",");
+            StringBuilder buf = new StringBuilder(val.length());
+            for (int i = 0; i < vals.length; i++) {
+                String v = vals[i];
+                int len = v.length();
+                if (len == 0)
+                    continue;
+                if (len == 60 && v.endsWith(".b32.i2p")) {
+                    byte[] b = Base32.decode(v.substring(0, 52));
+                    if (b != null)
+                        v = Base64.encode(b);
+                }
+                buf.append(v);
+                if (i != vals.length - 1)
+                    buf.append(',');
+            }
+            _otherOptions.put("i2cp.accessList", buf.toString());
+        }
    }

    public void setJumpList(String val) {
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@ -609,12 +609,12 @@
        </tr><tr>
            <td colspan="2">
                <span class="multiOption" <%=ehdisabled%>>
-                    <label><input value="0" type="radio" id="startOnLoad" name="encType" <%=(has0 ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
+                    <label><input value="0" type="radio" id="startOnLoad" name="encType" <%=((has0 && !has4) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
                    ElGamal-2048</label>
                </span>
                <span class="multiOption" <%=ehdisabled%>>
-                    <label><input value="4" type="radio" id="startOnLoad" name="encType" <%=(has4 ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
-                    ECIES-X25519 (<%=intl._t("Experts only!")%>)</label>
+                    <label><input value="4" type="radio" id="startOnLoad" name="encType" <%=((has4 && !has0) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
+                    ECIES-X25519</label>
                </span>
                <span class="multiOption" <%=ehdisabled%>>
                    <label><input value="4,0" type="radio" id="startOnLoad" name="encType" <%=((has0 && has4) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@ -701,12 +701,12 @@
        </tr><tr>
            <td colspan="2">
                <span class="multiOption" <%=ehdisabled%>>
-                    <label><input value="0" type="radio" id="startOnLoad" name="encType" <%=(has0 ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
+                    <label><input value="0" type="radio" id="startOnLoad" name="encType" <%=((has0 && !has4) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
                    ElGamal-2048</label>
                </span>
                <span class="multiOption" <%=ehdisabled%>>
-                    <label><input value="4" type="radio" id="startOnLoad" name="encType" <%=(has4 ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
-                    ECIES-X25519 (<%=intl._t("Experts only!")%>)</label>
+                    <label><input value="4" type="radio" id="startOnLoad" name="encType" <%=((has4 && !has0) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
+                    ECIES-X25519</label>
                </span>
                <span class="multiOption" <%=ehdisabled%>>
                    <label><input value="4,0" type="radio" id="startOnLoad" name="encType" <%=((has0 && has4) ? " checked=\"checked\"" : edisabled)%> class="tickbox" />
@ -911,7 +911,7 @@
            </th>
        </tr><tr>
            <th colspan="5">
-                <%=intl._t("Inbound connection limits (0=unlimited)")%>
+                <%=intl._t("Inbound connection limits")%>
            </th>
        </tr><tr>
            <td></td>
@ -921,27 +921,30 @@
            <td class="blankColumn"></td>
        </tr><tr>
            <td><b><%=intl._t("Per Client")%></b></td>
+<%
+   String unlimited = " (0 = " + intl._t("unlimited") + ')';
+%>
            <td>
-                <input type="text" name="limitMinute" title="<%=intl._t("Maximum number of web page requests per minute for a unique client before access to the server is blocked")%>" value="<%=editBean.getLimitMinute(curTunnel)%>" class="freetext" />
+                <input type="text" name="limitMinute" title="<%=intl._t("Maximum number of web page requests per minute for a unique client before access to the server is blocked") + unlimited %>" value="<%=editBean.getLimitMinute(curTunnel)%>" class="freetext" />
            </td><td>
-                <input type="text" name="limitHour" title="<%=intl._t("Maximum number of web page requests per hour for a unique client before access to the server is blocked")%>" value="<%=editBean.getLimitHour(curTunnel)%>" class="freetext" />
+                <input type="text" name="limitHour" title="<%=intl._t("Maximum number of web page requests per hour for a unique client before access to the server is blocked") + unlimited %>" value="<%=editBean.getLimitHour(curTunnel)%>" class="freetext" />
            </td><td>
-                <input type="text" name="limitDay" title="<%=intl._t("Maximum number of web page requests per day for a unique client before access to the server is blocked")%>" value="<%=editBean.getLimitDay(curTunnel)%>" class="freetext" />
+                <input type="text" name="limitDay" title="<%=intl._t("Maximum number of web page requests per day for a unique client before access to the server is blocked") + unlimited %>" value="<%=editBean.getLimitDay(curTunnel)%>" class="freetext" />
            </td><td class="blankColumn"></td>
        </tr><tr>
            <td><b><%=intl._t("Total")%></b></td>
            <td>
-                <input type="text" name="totalMinute" title="<%=intl._t("Total number of web page requests per minute before access to the server is blocked")%>" value="<%=editBean.getTotalMinute(curTunnel)%>" class="freetext" />
+                <input type="text" name="totalMinute" title="<%=intl._t("Total number of web page requests per minute before access to the server is blocked") + unlimited %>" value="<%=editBean.getTotalMinute(curTunnel)%>" class="freetext" />
            </td><td>
-                <input type="text" name="totalHour" title="<%=intl._t("Total number of web page requests per hour before access to the server is blocked")%>" value="<%=editBean.getTotalHour(curTunnel)%>" class="freetext" />
+                <input type="text" name="totalHour" title="<%=intl._t("Total number of web page requests per hour before access to the server is blocked") + unlimited %>" value="<%=editBean.getTotalHour(curTunnel)%>" class="freetext" />
            </td><td>
-                <input type="text" name="totalDay" title="<%=intl._t("Total number of web page requests per day before access to the server is blocked")%>" value="<%=editBean.getTotalDay(curTunnel)%>" class="freetext" />
+                <input type="text" name="totalDay" title="<%=intl._t("Total number of web page requests per day before access to the server is blocked") + unlimited %>" value="<%=editBean.getTotalDay(curTunnel)%>" class="freetext" />
            </td><td class="blankColumn"></td>
        </tr><tr>
-            <th colspan="5"><%=intl._t("Max concurrent connections (0=unlimited)")%></th>
+            <th colspan="5"><%=intl._t("Max concurrent connections")%></th>
        </tr><tr>
            <td></td><td>
-                <input type="text" name="maxStreams" title="<%=intl._t("Maximum number of simultaneous client connections")%>" value="<%=editBean.getMaxStreams(curTunnel)%>" class="freetext" />
+                <input type="text" name="maxStreams" title="<%=intl._t("Maximum number of simultaneous client connections") + unlimited %>" value="<%=editBean.getMaxStreams(curTunnel)%>" class="freetext" />
            </td><td></td><td></td><td class="blankColumn"></td>
        </tr>
 <%
@ -949,7 +952,7 @@
 %>
        <tr>
            <th colspan="5">
-                <%=intl._t("POST limits (0=unlimited)")%>
+                <%=intl._t("POST limits")%>
            </th>
        </tr><tr>
            <td></td><td>
@ -962,7 +965,7 @@
                <b><%=intl._t("Per Client")%>
                </b>
            </td><td>
-                <input type="text" name="postMax" title="<%=intl._t("Maximum number of post requests permitted for a unique client for the configured time span")%>" value="<%=editBean.getPostMax(curTunnel)%>" class="freetext quantity"/>
+                <input type="text" name="postMax" title="<%=intl._t("Maximum number of post requests permitted for a unique client for the configured time span") + unlimited %>" value="<%=editBean.getPostMax(curTunnel)%>" class="freetext quantity"/>
            </td><td colspan="2">
                <input type="text" name="postBanTime" title="<%=intl._t("If a client exceeds the maximum number of post requests per allocated period, enforce a ban for this number of minutes")%>" value="<%=editBean.getPostBanTime(curTunnel)%>" class="freetext period"/>
                <%=intl._t("minutes")%>
@ -972,7 +975,7 @@
                <b><%=intl._t("Total")%>
                </b>
            </td><td>
-                <input type="text" name="postTotalMax" title="<%=intl._t("Total number of post requests permitted for the configured time span")%>" value="<%=editBean.getPostTotalMax(curTunnel)%>" class="freetext quantity"/>
+                <input type="text" name="postTotalMax" title="<%=intl._t("Total number of post requests permitted for the configured time span") + unlimited %>" value="<%=editBean.getPostTotalMax(curTunnel)%>" class="freetext quantity"/>
            </td><td colspan="2">
                <input type="text" name="postTotalBanTime" title="<%=intl._t("If the maximum number of post requests per allocated period is exceeded, enforce a global access ban for this number of minutes")%>" value="<%=editBean.getPostTotalBanTime(curTunnel)%>" class="freetext period"/>
                <%=intl._t("minutes")%>
--- a/apps/i2ptunnel/jsp/themes/light/i2ptunnel.css
+++ b/apps/i2ptunnel/jsp/themes/light/i2ptunnel.css
@ -47,7 +47,7 @@ form {
 }

 input[type="checkbox"], input[type="radio"] {
-     margin: 5px 3px 5px 5px;
+     margin: 4px 5px 6px;
     background: none;
     vertical-align: sub;
     min-width: 16px;
@ -216,7 +216,7 @@ hr {
     box-sizing: border-box;
     margin: 2px 4px !important;
     min-width: 70px !important;
-     padding: 7px 8px 3px;
+     padding: 5px 8px 5px;
 }

 .control:hover, .control:focus {
--- a/apps/i2ptunnel/locale-proxy/messages_sv.po
+++ b/apps/i2ptunnel/locale-proxy/messages_sv.po
@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-05 14:31+0000\n"
-"PO-Revision-Date: 2021-06-23 09:38+0000\n"
+"PO-Revision-Date: 2021-10-02 15:40+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@ -116,7 +116,7 @@ msgstr "Webbplatsen var inte nåbar."
 msgid ""
 "The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Webbplatsen är frånkopplad, nätverket är under stor belastning eller så är din router inte välintegrerad med noder."
+msgstr "Webbplatsen är frånkopplad, nätverket är under stor belastning, eller din router är ännu inte välintegrerad med noder."

 #: ../java/build/Proxy.java:14 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:109 ../java/build/Proxy.java:129
@ -130,7 +130,7 @@ msgstr "Du kanske vill {0}försöka igen{1}."
 #: ../java/build/Proxy.java:118 ../java/build/Proxy.java:130
 #: ../java/build/Proxy.java:171 ../java/build/Proxy.java:196
 msgid "Could not find the following destination:"
-msgstr "Kunde inte hitta följande mål:"
+msgstr "Det gick inte att hitta följande destination:"

 #: ../java/build/Proxy.java:16 ../java/build/Proxy.java:22
 #: ../java/build/Proxy.java:160 ../java/build/Proxy.java:166
--- a/apps/i2ptunnel/locale/messages_ar.po
+++ b/apps/i2ptunnel/locale/messages_ar.po
--- a/apps/i2ptunnel/locale/messages_cs.po
+++ b/apps/i2ptunnel/locale/messages_cs.po
--- a/apps/i2ptunnel/locale/messages_da.po
+++ b/apps/i2ptunnel/locale/messages_da.po
--- a/apps/i2ptunnel/locale/messages_de.po
+++ b/apps/i2ptunnel/locale/messages_de.po
--- a/apps/i2ptunnel/locale/messages_en.po
+++ b/apps/i2ptunnel/locale/messages_en.po
--- a/apps/i2ptunnel/locale/messages_es.po
+++ b/apps/i2ptunnel/locale/messages_es.po
--- a/apps/i2ptunnel/locale/messages_fa.po
+++ b/apps/i2ptunnel/locale/messages_fa.po
--- a/apps/i2ptunnel/locale/messages_fi.po
+++ b/apps/i2ptunnel/locale/messages_fi.po
--- a/apps/i2ptunnel/locale/messages_fr.po
+++ b/apps/i2ptunnel/locale/messages_fr.po
--- a/apps/i2ptunnel/locale/messages_hu.po
+++ b/apps/i2ptunnel/locale/messages_hu.po
--- a/apps/i2ptunnel/locale/messages_in.po
+++ b/apps/i2ptunnel/locale/messages_in.po
--- a/apps/i2ptunnel/locale/messages_it.po
+++ b/apps/i2ptunnel/locale/messages_it.po
--- a/apps/i2ptunnel/locale/messages_ja.po
+++ b/apps/i2ptunnel/locale/messages_ja.po
--- a/apps/i2ptunnel/locale/messages_ko.po
+++ b/apps/i2ptunnel/locale/messages_ko.po
--- a/apps/i2ptunnel/locale/messages_nb.po
+++ b/apps/i2ptunnel/locale/messages_nb.po
--- a/apps/i2ptunnel/locale/messages_nl.po
+++ b/apps/i2ptunnel/locale/messages_nl.po
--- a/apps/i2ptunnel/locale/messages_nn.po
+++ b/apps/i2ptunnel/locale/messages_nn.po
--- a/apps/i2ptunnel/locale/messages_pl.po
+++ b/apps/i2ptunnel/locale/messages_pl.po
--- a/apps/i2ptunnel/locale/messages_pt.po
+++ b/apps/i2ptunnel/locale/messages_pt.po
--- a/apps/i2ptunnel/locale/messages_pt_BR.po
+++ b/apps/i2ptunnel/locale/messages_pt_BR.po
--- a/apps/i2ptunnel/locale/messages_ro.po
+++ b/apps/i2ptunnel/locale/messages_ro.po
--- a/apps/i2ptunnel/locale/messages_ru.po
+++ b/apps/i2ptunnel/locale/messages_ru.po
--- a/apps/i2ptunnel/locale/messages_sk.po
+++ b/apps/i2ptunnel/locale/messages_sk.po
--- a/apps/i2ptunnel/locale/messages_sq.po
+++ b/apps/i2ptunnel/locale/messages_sq.po
--- a/apps/i2ptunnel/locale/messages_sv.po
+++ b/apps/i2ptunnel/locale/messages_sv.po
--- a/apps/i2ptunnel/locale/messages_tr.po
+++ b/apps/i2ptunnel/locale/messages_tr.po
--- a/apps/i2ptunnel/locale/messages_uk.po
+++ b/apps/i2ptunnel/locale/messages_uk.po
--- a/apps/i2ptunnel/locale/messages_vi.po
+++ b/apps/i2ptunnel/locale/messages_vi.po
--- a/apps/i2ptunnel/locale/messages_zh.po
+++ b/apps/i2ptunnel/locale/messages_zh.po
--- a/apps/i2ptunnel/locale/messages_zh_TW.po
+++ b/apps/i2ptunnel/locale/messages_zh_TW.po
--- a/apps/jetty/apache-tomcat-9.0.45/bin/tomcat-juli.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/bin/tomcat-juli.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/el-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/el-api.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/jasper-el.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/jasper-el.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/jasper.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/jasper.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/jsp-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/jsp-api.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/servlet-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/servlet-api.jar
--- a/apps/jetty/apache-tomcat-9.0.45/lib/tomcat-util-scan.jar
+++ b/apps/jetty/apache-tomcat-9.0.45/lib/tomcat-util-scan.jar
--- a/apps/jetty/apache-tomcat-9.0.54/NOTICE
+++ b/apps/jetty/apache-tomcat-9.0.54/NOTICE
--- a/apps/jetty/apache-tomcat-9.0.54/bin/tomcat-juli.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/bin/tomcat-juli.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/el-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/el-api.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/jasper-el.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/jasper-el.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/jasper.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/jasper.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/jsp-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/jsp-api.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/servlet-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/servlet-api.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-api.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-api.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util-scan.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util-scan.jar
--- a/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util.jar
+++ b/apps/jetty/apache-tomcat-9.0.54/lib/tomcat-util.jar
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@ -17,7 +17,7 @@

    <property name="jetty.branch" value="stable-9" />
    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="acf3118a5cbfb3a6dfe218d3f20ecff09974d921" />
+    <property name="jetty.sha1" value="e9f176730aea36a69c24eeba77dd0880a30492dc" />
    <property name="jetty.filename" value="${jetty.base}.zip" />
    <property name="jetty.url" value="https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
    <property name="verified.filename" value="verified.txt" />
@ -169,14 +169,14 @@
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-continuation-${jetty.ver}.jar" tofile="jettylib/jetty-continuation.jar" />
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-deploy-${jetty.ver}.jar" tofile="jettylib/jetty-deploy.jar" />
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-http-${jetty.ver}.jar" tofile="jettylib/jetty-http.jar" />
-<!--
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" tofile="jettylib/jetty-io.jar" />
-->
      <!-- comment out above line and uncomment below and the patches section further down if we need patches -->
+<!--
        <jar destfile="jettylib/jetty-io.jar"  manifest="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" filesetmanifest="mergewithoutmain" >
            <zipfileset excludes="**/SslConnection*.class" src="${jetty.base}/lib/jetty-io-${jetty.ver}.jar" />
            <zipfileset src="build/jetty-io-patch.jar" />
        </jar>
+-->
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-jmx-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-rewrite-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-security-${jetty.ver}.jar" tofile="jettylib/jetty-security.jar" />
@ -494,6 +494,7 @@
            classpath="" >
            <compilerarg line="${javac.compilerargs}" />
        </javac>
+<!--
        <mkdir dir="./build/objPatches2" />
        <javac 
            srcdir="./patches/jetty-io/src/main/java" 
@ -508,11 +509,14 @@
                <pathelement location="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" />
            </classpath>
        </javac>
+-->
    </target>

    <target name="jarPatches" depends="compilePatches, jarPatchesUpToDate" unless="jarPatches.uptodate" >
        <jar destfile="./build/jetty-util-patch.jar" basedir="./build/objPatches" includes="**/*.class" />
+<!--
        <jar destfile="./build/jetty-io-patch.jar" basedir="./build/objPatches2" includes="**/*.class" />
+-->
    </target>    

    <target name="jarPatchesUpToDate" >
@ -521,7 +525,9 @@
                <equals arg1="${with-libjetty9-java}" arg2="true" />
                <uptodate property="jarPatches.uptodate" targetfile="jettylib/jetty-i2p.jar" >
                    <srcfiles dir= "build/objPatches" includes="**/*.class" />
+<!--
                    <srcfiles dir= "build/objPatches2" includes="**/*.class" />
+-->
                </uptodate>
            </or>
        </condition>
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-continuation-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-continuation-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-deploy-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-deploy-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-http-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-http-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-io-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-io-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-jmx-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-jmx-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-rewrite-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-rewrite-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-security-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-security-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-server-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-server-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-servlet-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-servlet-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-servlets-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-servlets-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-util-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-util-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-webapp-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-webapp-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-xml-9.3.29.v20201019.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/lib/jetty-xml-9.3.29.v20201019.jar
--- a/apps/jetty/jetty-distribution-9.3.29.v20201019/start.jar
+++ b/apps/jetty/jetty-distribution-9.3.29.v20201019/start.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-continuation-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-continuation-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-deploy-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-deploy-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-http-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-http-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-io-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-io-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-jmx-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-jmx-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-rewrite-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-rewrite-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-security-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-security-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-server-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-server-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-servlet-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-servlet-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-servlets-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-servlets-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-util-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-util-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-webapp-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-webapp-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-xml-9.3.30.v20211001.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/lib/jetty-xml-9.3.30.v20211001.jar
--- a/apps/jetty/jetty-distribution-9.3.30.v20211001/start.jar
+++ b/apps/jetty/jetty-distribution-9.3.30.v20211001/start.jar
--- a/apps/jetty/patches/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
+++ b/apps/jetty/patches/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
--- a/apps/ministreaming/locale/messages_sl.po
+++ b/apps/ministreaming/locale/messages_sl.po
@ -0,0 +1,94 @@
+# I2P
+# Copyright (C) 2014 The I2P Project
+# This file is distributed under the same license as the streaming package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Žan Šadl-Ferš, 2021
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-29 14:30+0000\n"
+"PO-Revision-Date: 2021-11-08 23:58+0000\n"
+"Last-Translator: Žan Šadl-Ferš\n"
+"Language-Team: Slovenian (http://www.transifex.com/otf/I2P/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69
+msgid "Message timeout"
+msgstr "Iztek časa sporočila"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72
+msgid "Failed delivery to local destination"
+msgstr "Neuspešna dostava na lokalni cilj"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:108
+msgid "Local router failure"
+msgstr "Napaka lokalnega usmerjevalnika"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:78
+msgid "Local network failure"
+msgstr "Napaka lokalnega omrežja"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:81
+msgid "Session closed"
+msgstr "Seja zaključena"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:84
+msgid "Invalid message"
+msgstr "Neveljavno sporočilo"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:87
+msgid "Invalid message options"
+msgstr "Neveljavne možnosti sporočila"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:90
+msgid "Buffer overflow"
+msgstr "Pretok medpomnilnika"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:93
+msgid "Message expired"
+msgstr "Sporočilo je poteklo"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96
+msgid "Local lease set invalid"
+msgstr "Lokalni nabor najema ni veljaven"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:99
+msgid "No local tunnels"
+msgstr "Brez lokalnih predorov"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:102
+msgid "Unsupported encryption options"
+msgstr "Nepodprte možnosti šifriranja"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:105
+msgid "Invalid destination"
+msgstr "Neveljaven cilj"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:111
+msgid "Destination lease set expired"
+msgstr "Ciljni nabor najema je potekel"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:114
+msgid "Destination lease set not found"
+msgstr "Ciljni nabor najema ni bil najden"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:117
+msgid "Local destination shutdown"
+msgstr "Zaustavitev lokalnega cilja"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:120
+msgid "Connection was reset"
+msgstr "Povezava je bila ponastavljena"
+
+#. Translate this one here, can't do it later
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:127
+msgid "Failure code"
+msgstr "Koda napake"
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@ -115,9 +115,11 @@ do
 			RC=1
 			break
 		fi
-		rm -f ${i}t
-		# so we don't do this again
-		touch $i
+		# the string with '75%' causes it to add a java-printf-format directive,
+		# and then the testscript fails if the translated
+		# string doesn't have a '%' in it; strip out the directive
+		grep -v java-printf-format $i > ${i}t
+		mv ${i}t ${i}
 	fi

    if [ "$LG" != "en" ]
--- a/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties
@ -50,7 +50,7 @@ dialup = Modem telef\u00f2nic
 dialup2 = Trucada
 diffrentVersion = Advert\u00e8ncia: N\u00famero de versi\u00f3 diferente
 done = Fet.
-done2 = Tcpbw100 fet
+done2 = fet
 dupAcksIn = es reben ack's duplicats
 duplexFullHalf = Alarma: Condici\u00f3 doble no concordant detectada Switch=Full i Host=half
 duplexHalfFull = Alarma: Condici\u00f3 doble no concordant detectada Switch=half i Host=full
@ -80,7 +80,7 @@ getWeb10gVar = Obt\u00e9 les variables Web10G
 halfDuplex = subxarxa Half duplex Fast Ethernet
 id = Eina de diagn\u00f2stic de xara TCP/Web100/Web10G
 immediate = immediat
-inboundTest = Test d'entrada Tcpbw100...
+inboundTest = Test d'entrada...
 inboundWrongMessage = Test de throughput C2S: Rebut un tipus de missatge erroni
 incompatibleVersion = N\u00famero de versi\u00f3 incompatible
 incrRxBuf = Augmentant el valor del buffer de recepci\u00f3 del client
@ -88,7 +88,7 @@ incrTxBuf = Augmentant el buffer de sortida del servidor NDT
 information = Informaci\u00f3
 initialization = Inicialitzant...
 insufficient = No es disposa de prou dades per a determinar el tipus d'enlla\u00e7.
-invokingMailtoFunction = Invocant funci\u00f3 Mailto Tcpbw100
+invokingMailtoFunction = Invocant funci\u00f3 Mailto
 ipProtocol = Protocol IP
 ipcFail = Fallen les comunicacions entre processos, tipus d'enlla\u00e7 desconegut.
 usingIpv4 =  --  Utilitzant adre\u00e7a IPv4
@ -111,7 +111,7 @@ middlebox = Middlebox
 middleboxFail = El servidor ha fallat mentre es provaba la middlebox
 middleboxFail2 = test Middlebox FALLA!
 middleboxModifyingMss = Informaci\u00f3: La middlebox de xarxa est\u00e0 modificant la variable MSS
-middleboxTest = Test de Middlebox Tcpbw100...
+middleboxTest = Test de Middlebox...
 moreDetails = M\u00e9s detalls...
 name = Nom
 ndtServerHas = El servidor NDT t\u00e9 un 
@ -128,7 +128,7 @@ options = Opcions
 osData = dades del SO:
 otherClient = S'est\u00e0 servint un altre client, la seva prova comen\u00e7ar\u00e0 en
 otherTraffic = Informaci\u00f3: L'enlla\u00e7 de xarxa est\u00e0 congestionat per algun altre tr\u00e0fic
-outboundTest = Test de sortida Tcpbw100...
+outboundTest = Test de sortida...
 outboundWrongMessage = Test de throughput C2S: Es rep un tipus de missatge erroni
 packetQueuing = Posant paquets en cua
 packetQueuingInfo = TCP (Transmission Control Protocol)  transfereix dades entre dos\n equips d'internet. Autom\u00e0ticament detecta i es recupera d'errors i p\u00e8rdues./n TCP utilitza buffers per a proporcionar aquesta confiabilitat.  Adem\u00e9s,\n els switch i routers 
@ -146,7 +146,7 @@ preferIPv6 = prefereix IPv6
 printDetailedStats = Imprimir Estad\u00edstiques detallades
 protocolError = Error de Protocol! S'esperava 'prepare', s'obt\u00e9: 0x
 qSeen = Test de throughput: Detectat encuament de paquets
-ready = Tcpbw100 llest
+ready = llest
 receiveBufferShouldBe = Informaci\u00f3: El buffer de recepci\u00f3 hauria de ser
 receiving = Rebent resultats...
 reportProblem = Informar el problema
--- a/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties
--- a/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties
@ -50,7 +50,7 @@ dialup = Dial-up Modem
 dialup2 = Dial-up
 diffrentVersion = WARNING: NDT server has different version number
 done = Done.
-done2 = Tcpbw100 done
+done2 = done
 dupAcksIn = duplicate acks received
 duplexFullHalf = Alarm: Duplex Mismatch condition detected Switch=Full and Host=half
 duplexHalfFull = Alarm: Duplex Mismatch condition detected Switch=half and Host=full
@ -80,7 +80,7 @@ getWeb10gVar = Get Web10G Variables
 halfDuplex = Half duplex Fast Ethernet subnet
 id = TCP/Web100/Web10G Network Diagnostic Tool
 immediate = immediate
-inboundTest = Tcpbw100 inbound test...
+inboundTest = inbound test...
 inboundWrongMessage = C2S throughput test: Received wrong type of the message
 incompatibleVersion = Incompatible version number
 incrRxBuf = Increasing the the client's receive buffer
@ -88,7 +88,7 @@ incrTxBuf = Increasing the NDT server's send buffer
 information = Information
 initialization = Initialization...
 insufficient = Insufficent data collected to determine link type.
-invokingMailtoFunction = Tcpbw100 Invoking Mailto function
+invokingMailtoFunction = Invoking Mailto function
 ipProtocol = IP protocol
 ipcFail = Interprocess communications failed, unknown link type.
 usingIpv4 =  --  Using IPv4 address
@ -111,7 +111,7 @@ middlebox = Middlebox
 middleboxFail = Server Failed while middlebox testing
 middleboxFail2 = Middlebox test FAILED!
 middleboxModifyingMss = Information: Network Middlebox is modifying MSS variable
-middleboxTest = Tcpbw100 Middlebox test...
+middleboxTest = Middlebox test...
 moreDetails = More Details...
 name = Name
 ndtServerHas = The NDT server has a
@ -128,7 +128,7 @@ options = Options
 osData = OS data:
 otherClient = Another client is currently being served, your test will begin within 
 otherTraffic = Information: Other network traffic is congesting the link
-outboundTest = Tcpbw100 outbound test...
+outboundTest = outbound test...
 outboundWrongMessage = C2S throughput test: Received wrong type of the message
 packetQueuing = Packet queuing
 packetQueuingInfo = TCP (Transmission Control Protocol) reliably transfers data between two\n Internet hosts.  It automatically detects and recovers from errors and\n losses.  TCP uses buffers to provide this reliability.  In addition,\n switches and routers use buffers to handle cases where multiple input\n links send packets to a single output link or link speeds change\n (FastEthernet to DSL modem).\n\n The NDT server generates and sends 10 seconds of data to the client.  In\n some cases the server can generate data faster than it can send packets\n into the network (e.g., a 2 GHz CPU sending to a DSL connected client).\n When this happens, some packets may remain in the server output queue\n when the 10 second timer expires.  TCP will automatically continue to\n send these queued packets and the client will continue to accept and\n process these incoming packets.  This will result in the client test\n running longer than expected.\n\n This condition has occurred during this test.  No action is required to\n resolve this issue.
@ -145,7 +145,7 @@ preferIPv6 = prefer IPv6
 printDetailedStats = Print Detailed Statistics
 protocolError = Protocol error!  Expected 'prepare', got: 0x
 qSeen = throughput test: Packet queuing detected
-ready = Tcpbw100 ready
+ready = ready
 receiveBufferShouldBe = Information: The receive buffer should be
 receiving = Receiving results...
 reportProblem = Report problem
--- a/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties
@ -50,7 +50,7 @@ dialup = Dial-up Modem
 dialup2 = Dial-up
 diffrentVersion = Attention: Num\u00E9ro de version diff\u00E9rent
 done = R\u00E9alis\u00E9.
-done2 = Tcpbw100 r\u00E9alis\u00E9
+done2 = r\u00E9alis\u00E9
 dupAcksIn = r\u00E9ception de acks en doublon
 duplexFullHalf = Alerte: condition de duplex mismatch d\u00E9tect\u00E9e, commutateur=full et h\u00F4te=half
 duplexHalfFull = Alerte: condition de duplex mismatch d\u00E9tect\u00E9e, commutateur=half et h\u00F4te=full
@ -80,7 +80,7 @@ getWeb10gVar = R\u00E9cup\u00E9rer les variables Web10G
 halfDuplex = Half duplex Fast Ethernet subnet
 id = Outil de diagnostics r\u00E9seau TCP/Web100/Web10G
 immediate = imm\u00E9diat
-inboundTest = test d'entr\u00E9e Tcpbw100...
+inboundTest = test d'entr\u00E9e...
 inboundWrongMessage = Test de d\u00E9bit C2S : r\u00E9ception du mauvais type de message
 incompatibleVersion = Num\u00E9ro de version incompatible
 incrRxBuf = Agrandissement du tampon de r\u00E9ception client
@ -88,7 +88,7 @@ incrTxBuf = Agrandissement du tampon d'\u00E9mission du serveur NDT
 information = Information
 initialization = Initialisation...
 insufficient = Trop peu de donn\u00E9es collect\u00E9es pour d\u00E9terminer le type de lien.
-invokingMailtoFunction = Tcpbw100 Appel de la fonction Mailto
+invokingMailtoFunction = Appel de la fonction Mailto
 ipProtocol = Protocole IP
 ipcFail = Communication inter-processus \u00E9chou\u00E9e, type de lien inconnu.
 usingIpv4 =  --  Utilisation de l'adresse IPv4
@ -111,7 +111,7 @@ middlebox = Middlebox
 middleboxFail = \u00C9chec du serveur lors du test de middlebox
 middleboxFail2 = Test de middlebox \u00C9CHOU\u00C9!
 middleboxModifyingMss = Information: le Middlebox modifie la variable MSS
-middleboxTest = Tcpbw100 test de Middlebox...
+middleboxTest = test de Middlebox...
 moreDetails = Plus de d\u00E9tails...
 name = Nom
 ndtServerHas = Le serveur NDT a un
@ -128,7 +128,7 @@ options = Options
 osData = Donn\u00E9es de l'OS:
 otherClient = Un autre client est actuellement en train d'\u00EAtre servi, votre test commencera dans 
 otherTraffic = Information: d'autres flux r\u00E9seaux congestionnent le lien
-outboundTest = Tcpbw100 test de sortie ...
+outboundTest = test de sortie ...
 outboundWrongMessage = Test de d\u00E9bit C2S : R\u00E9ception du mauvais type de message
 packetQueuing = Mise en file d'attente de paquets
 packetQueuingInfo = TCP (Transmission Control Protocol) transf\u00E8re des donn\u00E9es de mani\u00E8re fiable entre deux\n h\u00F4tes Internet. Il d\u00E9tecte et r\u00E9cup\u00E8re automatiquement les erreurs et\n pertes.  TCP utilise des tampons pour fournir cette fiabilit\u00E9. De plus,\n des commutateurs et routeurs utilisent des tampons pour g\u00E9rer les cas dans lesquels plusieurs liens\n d'entr\u00E9e envoient des paquets \u00E0 un seul lien de sortie ou lorsque la vitesse des liens est diff\u00E9rente\n (FastEthernet vers un modem DSL).\n\n Le serveur NDT g\u00E9n\u00E8re et envoie 10 secondes de donn\u00E9es au client. Dans\n certains cas le serveur peut produire des donn\u00E9es plus vite qu'il ne peut envoyer les paquets\n vers le r\u00E9seau (p.e., un CPU de 2 GHz \u00E9mettant vers un client connect\u00E9 en DSL).\n Quand cela arrive, certains paquets peuvent rester dans la file d'attente de sortie du serveur\n lorsque la minuterie de 10 secondes se termine.  TCP continuera automatiquement \n d'envoyer ces paquets en file d'attente et le client continuera \u00E0 les accepter et\n \u00E0 g\u00E9rer ces paquets entrants.  Ceci aura pour r\u00E9sultat que le test client\n dure plus longtemps que pr\u00E9vu.\n\n Cette condition s'est r\u00E9alis\u00E9e durant ce test.  Aucune action n'est n\u00E9cessaire pour r\u00E9soudre ce probl\u00E8me.
@ -145,7 +145,7 @@ preferIPv6 = pr\u00E9f\u00E9rer IPv6
 printDetailedStats = Afficher les statistiques d\u00E9taill\u00E9es
 protocolError = Erreur de protocole!  Attendait 'prepare', re\u00E7u: 0x
 qSeen = test de d\u00E9bit: Mise en file d'attente de paquets d\u00E9tect\u00E9e
-ready = Tcpbw100 pr\u00EAt
+ready = pr\u00EAt
 receiveBufferShouldBe = Information: Le tampon de r\u00E9ception devrait \u00EAtre
 receiving = Reception des r\u00E9sultats...
 reportProblem = Rapporter un probl\u00E8me
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zzz	619c36d18d	1.6.1	2021-11-29 12:21:54 -05:00
zzz	cf10a2d5b6	Tunnels: Fix NPE in BuildHandler	2021-11-29 12:19:02 -05:00
zzz	56fdc244d4	1.6.0	2021-11-29 10:41:18 -05:00
zzz	adc69c0d9a	Refresh Debian patch	2021-11-29 10:31:55 -05:00
zzz	dd9a5548a8	Man pages: Update bug reporting URL	2021-11-27 08:52:30 -05:00
zzz	ab88f86954	ShellService: More import cleanup	2021-11-27 08:05:57 -05:00
zzz	9466b225b6	blocklist update	2021-11-26 12:47:35 -05:00
zzz	ef1e2b02de	Build: Fix the tagged string with '75%' which causes gettext to add a java-printf-format directive, then the testscript fails if the translated string doesn't have a '%' in it; strip out the directive Bump for review	2021-11-26 11:13:41 -05:00
zzz	ee68aec647	Pull translations	2021-11-26 11:06:29 -05:00
zzz	3dfeb92b63	Update bug report links	2021-11-24 10:33:30 -05:00
zzz	ee5288ebb1	i2ptunnel: AccessFilter findbugs	2021-11-24 09:08:18 -05:00
zzz	488acdfd98	Util: ShellService findbugs and cleanups	2021-11-24 08:59:08 -05:00
idk	ee2e7ec30d	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.i2p	2021-11-23 14:08:19 -05:00
idk	40466bc602	Tweak location of dark theme animation. Closes #335	2021-11-23 14:06:41 -05:00
zzz	d8d6954ef0	BuildTime update	2021-11-23 09:57:59 -05:00
zzz	0aa4550bbe	Add Hungarian man pages	2021-11-23 07:51:47 -05:00
zzz	ad82946fd3	Tunnels: Drop request if hop throttle exceeded by 50% Revert banning peer in throttles	2021-11-23 07:25:53 -05:00
zzz	77b48a48ab	Console: Remove tinhat from home page at op's request	2021-11-22 09:38:35 -05:00
zzz	d948fa8db3	Update: Fix registered version of feed blocklist after update	2021-11-21 08:50:10 -05:00
zzz	31393c2bef	Update: Add message about pack200 plugins	2021-11-21 08:32:09 -05:00
zzz	e3fc34ef1f	Tunnels: Ban peer on excessive build requests Drop requests if previous or next peer is banned Console: Drop peer when manually banned Update: Drop peer when banlisted	2021-11-21 08:17:43 -05:00
idk	d7fdd6d9dc	Merge pull request #24 from kfeoktistoff/debian_mkdir_log_on_startup debian: create a log dir on startup if absent	2021-11-20 21:53:06 +00:00
idk	5a3a7b843a	Merge pull request #23 from shisheng-1/Modify_GRADLE_1 Improve GRADLE build Performance	2021-11-20 21:22:01 +00:00
Kirill Feoktistov	e06f8961b4	debian: create a log dir on startup if absent	2021-11-20 17:35:28 +00:00
idk	9d1aa5b762	Merge branch 'shellservice' into 'master' Manage Fork-and-Exec Plugins by Monitoring them by PID See merge request i2p-hackers/i2p.i2p!39	2021-11-17 17:42:50 +00:00
idk	2e71a0b36a	Manage Fork-and-Exec Plugins by Monitoring them by PID	2021-11-17 17:42:45 +00:00
zzz	b072f40ed1	Initial Slovenian translations for a few resources not added to menu yet	2021-11-17 09:00:00 -05:00
zzz	35d2f118ce	poupdate-source	2021-11-17 08:30:23 -05:00
idk	3f7f315951	Place .wizardnotice at bottom right of screen above the buttons on both dark and light themes(#335 )	2021-11-16 12:21:40 -05:00
zzz	6ef4c74d97	NTCP: Move wantsWrite(byte[]) from EventPumper to NTCPConnection for sanity in following the write code path, rather than going from con to pumper to con, keep the code in con. Prep for possible write-side improvements in a future release, ref: http://zzz.i2p/topics/3192	2021-11-16 11:09:05 -05:00
zzz	0e4d684e7d	NetDB: Add new reseed	2021-11-16 10:58:38 -05:00
zzz	e3be6b50ce	Tunnels: Use connected peer for closest inbound hop when approaching conn limits to increase tunnel build success This should reduce chances of tunnel builds pushing us over conn limits, and reduce build failures and watchdog warnings when at conn limits.	2021-11-12 07:21:27 -05:00
zzz	dad2bed334	GeoIP 2021-11-01	2021-11-09 08:35:11 -05:00
zzz	bbe66f0e18	Util: DoH server list update	2021-11-08 13:04:01 -05:00
shisheng-1	27bf65c1a4	Improve GRADLE build Performance	2021-11-06 00:13:26 +08:00
zzz	9c7b415d62	Util: Don't warn for new SU3 file types	2021-11-03 08:11:05 -04:00
zzz	78e4572a8c	CSS button and checkbox spacing, NTCP table fixes	2021-10-28 09:08:52 -04:00
zzz	4507ecd5f2	javadoc PKF clarification	2021-10-28 09:06:54 -04:00
zzz	721d39c01d	Remove UDPPacketReader logging	2021-10-28 08:25:43 -04:00
zzz	427fc1c1ca	More javadocs on getLibDir()	2021-10-27 10:02:45 -04:00
idk	33f1b3be87	Merge branch 'add-libdir' into 'master' Add an i2p.dir.lib property See merge request i2p-hackers/i2p.i2p!40	2021-10-26 16:22:37 +00:00
idk	7e1c8c7983	Add an i2p.dir.lib property	2021-10-26 16:22:36 +00:00
idk	aa6b27d829	Merge branch 'backup-locale-conf' into 'master' This adds inclusion of /etc/locale.conf to i2prouter i2p.init, per backup's... Closes #326 See merge request i2p-hackers/i2p.i2p!41	2021-10-26 16:06:13 +00:00
idk	999e2615c3	This adds inclusion of /etc/locale.conf to i2prouter i2p.init, per backup's...	2021-10-26 16:06:12 +00:00
zzz	807b7d672f	Debian: Update JRE dependencies	2021-10-23 12:03:49 -04:00
idk	685a2f1e39	`4217a05ae9` and `1e70849bde` were mis-tagged, cannot rewrite history on master, they apply to #335 and not #338	2021-10-21 13:53:48 -04:00
idk	4217a05ae9	Make the background images closer to exactly the same size on /welcome, #338	2021-10-21 13:40:28 -04:00
idk	1e70849bde	Checkin consistency fixes for wizard themes, should address remaining issues with #338	2021-10-21 12:53:01 -04:00
zzz	1ab3e9b310	SSU: Send Bob-to-Alice Peer Test message in-session Matches what i2pd does. More checks to require in-session for Alice/Bob and Bob/Charlie Peer Test messages.	2021-10-20 09:37:32 -04:00
zzz	fd2cf972bf	Javadoc typos	2021-10-14 07:49:02 -04:00
zzz	d9eed6446e	Util: Add more Intel processors to CPUID	2021-10-13 08:51:12 -04:00
zzz	6b823e6381	Tomcat 9.0.54	2021-10-11 10:46:26 -04:00
zzz	917b7e615e	javadoc fix	2021-10-11 07:43:15 -04:00
zzz	af97381461	Jetty 9.3.30.v20211001 Remove patched SslConnection.java for Jetty #6072, fix included in this release	2021-10-10 12:09:12 -04:00
idk	4975bb1482	Fix positioning of options on welcome page between instructional text and progression buttons	2021-10-06 11:43:21 -04:00
zzz	83e2246195	Console: eepProxy -> proxy	2021-10-05 10:32:20 -04:00
zzz	3632070e3f	i2ptunnel: Move the "(0 = unlimited)" text from section headers to tooltips	2021-10-05 09:56:55 -04:00
zzz	0cb30a085c	i2ptunnel: Save access list as B64 to save space Convert access list to B32 and sort in UI Remove blank lines in get/set	2021-10-05 09:34:57 -04:00
zzz	a7a59a2b1b	NetDB: Reduce ban time for routers without netId Don't ban routers with bad netId before RI validation, unless that router sent the RI	2021-10-05 08:40:30 -04:00
zzz	bf7155b935	NetDB: Consolidate getKBucketSetSize() calls reported by jogger fix javadoc	2021-10-03 10:13:04 -04:00
zzz	62fb294f54	Console: Replace n/a with -- on floodfills page for readability	2021-10-03 09:46:18 -04:00
zzz	b7e710b28f	Wizard: Add theme picker page Clean up configui.js CSS cleanups for new page TODO Gitlab #335	2021-10-03 09:05:26 -04:00
zzz	4a8534e4e6	SSU: Downgrade fragmentation log errors to warn reported by drzed	2021-10-02 13:40:23 -04:00
zzz	aa4e2f5c95	Console: ConfigUIHelper minor refactor (prep for wizard)	2021-10-02 09:06:50 -04:00
zzz	fe4fbce7bd	Wizard: Add a simple progress ticker to bw test status	2021-10-02 08:10:40 -04:00
idk	33374eacaa	add input:disabled and button:disabled to dark theme css	2021-10-01 13:12:21 -04:00
zzz	cea76ed9d5	i2ptunnel: Fix enc type configuration logic	2021-10-01 08:18:07 -04:00
zzz	f41db2685e	i2ptunnel: Center text in buttons (light)	2021-10-01 07:40:31 -04:00
zzz	95bf068b0a	i2ptunnel: Remove experts-only label for X25519-only option	2021-10-01 07:39:09 -04:00
idk	e2caa246f2	Line up the columns on results page of the bandwidth wizard. Remove some unnecessary box-shadows which are causing optboxes to appear blurry in some cases.	2021-09-30 16:36:46 -04:00
idk	bed013d858	hide notification div when bandwidth test is complete, switch back to green icon for slide messages	2021-09-30 14:14:10 -04:00
zzz	282460cb3f	Console: Add js to /configui to preview themes Save theme change before form processing so no refresh required Enable/disable reset and apply buttons on config clicks Prep for theme picker in wizard	2021-09-30 09:55:35 -04:00
idk	f015d1f490	Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.i2p	2021-09-29 17:56:48 -04:00
idk	f0758ee36f	Adjust alignment of notifications and increase contrast on dark theme /welcome, progress on #335	2021-09-29 17:55:49 -04:00
idk	c77e9537ae	Adjust alignment of notifications and increase contrast on dark theme /welcome, progress on #337	2021-09-29 17:54:08 -04:00
zzz	b7de63e922	Console: Wizard HTML fixes	2021-09-28 12:15:01 -04:00
zzz	13ade14289	Console: Refactor wizard progress indicator	2021-09-28 09:52:07 -04:00
zzz	2b43e4e4b5	Router: Rekey all Android/ARM routers	2021-09-27 10:26:03 -04:00
idk	571986a78b	Add transparent channel to wizardlogo.png s and blend with exclusion instead to improve appearance of logo on dark theme.	2021-09-26 02:24:42 -04:00
zzz	d7c89be9a2	Tunnels: Implement Bloom filter for short TBM Reduce TBM Bloom filter size and interval for EC routers	2021-09-25 09:12:15 -04:00
zzz	d466fd6799	UDP: Use a single PacketBuilder everywhere	2021-09-22 12:44:28 -04:00
zzz	116ec88f56	UDP: Replace ACKSender thread with per-PeerState delayed ack timers (low latency improvements part 2) Timer is created in PeerState messageFullyReceived() and messagePartiallyReceived(). Don't send a delayed ack-only packet if acks are sent in a data packet first. Reviewed and tested by zlatinb. Related MRs: !36 !37 !38	2021-09-22 12:12:16 -04:00
Zlatin Balevsky	346372e002	Merge branch 'ssu-low-latency-2' into 'master' SSU low-latency changes pt1 See merge request i2p-hackers/i2p.i2p!37	2021-09-17 16:36:42 +00:00
Zlatin Balevsky	f14b7d53a3	reduce the delay in ACKs to the minimum of rtt/2 and the constant	2021-09-17 17:32:37 +01:00
Zlatin Balevsky	3355daa334	introduce a lock just for _sendWindowBytesRemaining field	2021-09-17 17:31:45 +01:00
zzz	67fea26638	Wizard: remove 'Tcpbw100' from test status messages	2021-09-16 11:50:44 -04:00
zzz	b1c367777d	Console: Add constants for wizard page numbers to make it easier to add/remove/reorder pages later	2021-09-16 10:50:57 -04:00
zzz	3917dc6d2f	I2CP: Don't call listener.readError() after external client disconnect via destroySocketManager() prevents log error on normal client shutdown reported and tested by zlatinb	2021-09-10 13:43:26 -04:00
zzz	2d239edf34	Update: Get backup URLs from news feed Remove hardcoded backup URLs Parse i2p, clearnet, and clearnet-ssl URLs from news Write i2p, clearnet, and clearnet-ssl URLs to old news format Clearnet and clearnet-ssl URLs currently unused; no handler is registered	2021-09-05 10:47:10 -04:00
echelon	1fbe084b74	Update build.xml	2021-09-03 07:16:57 +00:00
Zlatin Balevsky	7a37f09334	Merge branch 'choking-retransmission-fix' into 'master' Prevent the sender from sending too far ahead of an unacked packet See merge request i2p-hackers/i2p.i2p!35	2021-09-02 17:26:54 +00:00
Zlatin Balevsky	1ae05103e4	Prevent the sender from sending too far ahead of an unacked packet	2021-09-02 18:22:12 +01:00
zzz	a66422fa3c	Console: Catch error checking systray availability (gitlab issue !331 )	2021-08-28 09:05:38 -04:00
zzz	dabc29f8a5	Build: Always echo JDK version	2021-08-27 09:51:32 -04:00
zzz	132da4a35a	Debian: Add copyright file to apparmor list	2021-08-27 09:42:28 -04:00
zzz	ea1eac2343	Tunnels: Enable sending short tunnel build messages, remove debug settings	2021-08-26 10:23:13 -04:00
zzz	569e035bfd	Router: Increase rekey probability to 1 in 4	2021-08-26 09:57:16 -04:00
zzz	8b1b5d4eb3	Debian files for 1.5.0 Fix build error dh_installdocs linking from the libjbigi-jni arch package to an arch:all package, this is an error for compat level 10.	2021-08-26 09:52:40 -04:00
zzz	33f64f7913	build checklists and windows scripts updates for 1.x	2021-08-24 09:58:17 -04:00