diff --git a/LICENSE.txt b/LICENSE.txt
index 06a2162ce2..0f0e5f9534 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -257,7 +257,7 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.2.29.v20191105 (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
@@ -332,7 +332,7 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.46 (jasper-runtime.jar):
+   Tomcat 8.5.50 (jasper-runtime.jar):
    (not included in most distribution packages)
    Copyright 1999-2019 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar
deleted file mode 100644
index ff94cd5f5b..0000000000
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/el-api.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/NOTICE b/apps/jetty/apache-tomcat-8.5.50/NOTICE
similarity index 100%
rename from apps/jetty/apache-tomcat-8.5.46/NOTICE
rename to apps/jetty/apache-tomcat-8.5.50/NOTICE
diff --git a/apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.50/bin/tomcat-juli.jar
similarity index 86%
rename from apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar
rename to apps/jetty/apache-tomcat-8.5.50/bin/tomcat-juli.jar
index 13c458dd9e..f00f867463 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-8.5.50/bin/tomcat-juli.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.50/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.50/lib/el-api.jar
new file mode 100644
index 0000000000..277d3673dc
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.50/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.50/lib/jasper-el.jar
similarity index 85%
rename from apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/jasper-el.jar
index ca374ce11b..0f0c715aa4 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.50/lib/jasper.jar
similarity index 75%
rename from apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/jasper.jar
index 596d2a6de4..d1a50945d8 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/jasper.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.50/lib/jsp-api.jar
similarity index 85%
rename from apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/jsp-api.jar
index 046bd308cc..94ee3bc4fa 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-api.jar
similarity index 77%
rename from apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/tomcat-api.jar
index d5dfe9842f..a6eb292cbb 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util-scan.jar
similarity index 91%
rename from apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util-scan.jar
index c80f5fd634..330abbc046 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util-scan.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util-scan.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util.jar
similarity index 66%
rename from apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar
rename to apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util.jar
index bc1090fdc0..b70c57bc22 100644
Binary files a/apps/jetty/apache-tomcat-8.5.46/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-8.5.50/lib/tomcat-util.jar differ
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index ce11cbff97..0f4d67afb9 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -18,7 +18,7 @@
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="086212b8536faa9a584777ebd59618fa4d7176a0" />
+    <property name="jetty.sha1" value="cc68beca7e11dd6c0067750499d9dea86ee6d2f0" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <!-- change jetty.ver to jetty.branch for 9.3 -->
     <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.29.v20191105.jar
similarity index 57%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.29.v20191105.jar
index 90105b0bb4..e7a46a9172 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-continuation-9.2.29.v20191105.jar
similarity index 76%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-continuation-9.2.29.v20191105.jar
index da7d4cd9a9..0f3f984f51 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-continuation-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-deploy-9.2.29.v20191105.jar
similarity index 85%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-deploy-9.2.29.v20191105.jar
index a1b1a41b0f..d518bfc959 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-deploy-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-http-9.2.29.v20191105.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-http-9.2.29.v20191105.jar
index b6edfe6168..f5fcdf971c 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-http-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-io-9.2.29.v20191105.jar
similarity index 75%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-io-9.2.29.v20191105.jar
index 2c4fcd2377..096b3250eb 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-io-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-jmx-9.2.29.v20191105.jar
similarity index 82%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-jmx-9.2.29.v20191105.jar
index d10e4f5952..4dfac1fb4e 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-jmx-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-rewrite-9.2.29.v20191105.jar
similarity index 80%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-rewrite-9.2.29.v20191105.jar
index ed3c972d47..ce8a079d97 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-rewrite-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-schemas-3.1.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-schemas-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-schemas-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-schemas-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-security-9.2.29.v20191105.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-security-9.2.29.v20191105.jar
index 1f8badebb1..ea3cab9aba 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-security-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-server-9.2.29.v20191105.jar
similarity index 90%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-server-9.2.29.v20191105.jar
index 646c52eb4c..95ec67122e 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-server-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlet-9.2.29.v20191105.jar
similarity index 79%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlet-9.2.29.v20191105.jar
index 222f6a3e1e..8d440aa191 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlet-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlets-9.2.29.v20191105.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlets-9.2.29.v20191105.jar
index 4a78e54961..cf4fd99375 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-servlets-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-util-9.2.29.v20191105.jar
similarity index 88%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-util-9.2.29.v20191105.jar
index 78796555df..e4ffe114ca 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-util-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-webapp-9.2.29.v20191105.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-webapp-9.2.29.v20191105.jar
index c3ae4a9edb..32f00cf25d 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-webapp-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-xml-9.2.29.v20191105.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-xml-9.2.29.v20191105.jar
index 1ef16feded..e8f774eaa5 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/jetty-xml-9.2.29.v20191105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/servlet-api-3.1.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/lib/servlet-api-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/lib/servlet-api-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/lib/servlet-api-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar b/apps/jetty/jetty-distribution-9.2.29.v20191105/start.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar
rename to apps/jetty/jetty-distribution-9.2.29.v20191105/start.jar
index d99baea589..02861f2c99 100644
Binary files a/apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar and b/apps/jetty/jetty-distribution-9.2.29.v20191105/start.jar differ
diff --git a/build.xml b/build.xml
index 9f6359266e..3007eb5e37 100644
--- a/build.xml
+++ b/build.xml
@@ -8,8 +8,8 @@
     <property file="override.properties"/>
     <property file="build.properties"/>
     <!--  When changing, also change javadoc URL in build.properties, and checksum in apps/jetty/build.xml -->
-    <property name="jetty.ver" value="9.2.25.v20180606" />
-    <property name="tomcat.ver" value="8.5.46" />
+    <property name="jetty.ver" value="9.2.29.v20191105" />
+    <property name="tomcat.ver" value="8.5.50" />
 
     <!-- You probably don't want to change anything from here down -->
     <target name="help" depends="all" />
diff --git a/history.txt b/history.txt
index c7b45b4301..02d4b6717b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,9 +1,53 @@
+2020-01-08 zzz
+ * Jetty 9.2.29.v20191105
+ * Tomcat 8.5.50
+
+2020-01-03 zzz
+ * Console:
+   - Don't refresh bw graph unless enclosing sidebar refresh\is longer
+   - Remove scroll-in-scroll for wrapper logs
+   - Refactor the configstats js
+ * i2psnark:
+   - CSS tweaks so the refresh isn't as glitchy
+   - Reduce default refresh to 15 sec
+ * Tests: Drop empty unit test files
+
 2020-01-02 idk
  * Dark Theme: Colors, borders, icons were simplified across the board
  * Images: Checked in icons from Feather icons, which are under the MIT License
   - https://github.com/feathericons/feather/blob/master/LICENSE
 
+2020-01-02 zzz
+ * Util:
+   - Add https redirect support to EepGet and SSLEepGet
+   - Add https support to EepGet CLI
+
+2019-12-25 zzz
+ * Console, webapps: CSP improvements
+ * Console: Remove onload and use nonce for inline scripts where able
+
+2019-12-24 zzz
+ * Console: Don't show a temporary IP ban if it's permanently banned also
+ * i2ptunnel: Double default conn. and POST limits
+
+2019-12-21 zzz
+ * Console:
+   - Don't show 'Unresolved TCP address' error
+   - Fix displayed name when installing new plugin
+ * i2psnark: Fix autostart for torrent files copied into the dir
+
+2019-12-20 zzz
+ * I2CP: Don't throw exception on early internalConnect()
+ * SSU:
+   - Reduce log level on packet size error (ticket #2675)
+   - Move statement affecting debug stats (ticket #2676)
+
+2019-12-18 zzz
+ * Proxy: Clean up links in error pages
+ * Router: Prep for a new router bundle
+
 2019-12-17 zzz
+ * Util: Move some from console to new core bundle
  * NetDB: Fixes for hidden routers losing peers (ticket #2673)
 
 2019-12-16 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa6..f6e6df3a5c 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";