Merge branch 'master' into add-tmp-to-install.jar

.dockerignore

@@ -29,3 +29,4 @@ installer/build
 router/java/build
 router/build
 
+override.properties

docker/rootfs/startapp.sh

@@ -11,7 +11,7 @@ fi
 # Explicitly define HOME otherwise it might not have been set
 export HOME=/i2p
 
-export I2P=${HOME}/i2p
+export I2P=${HOME}
 
 echo "Starting I2P"
 
@@ -31,6 +31,7 @@ if [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then
     echo "[startapp] setting reachable IP to container IP $IP_ADDR"
     find . -name '*.config' -exec sed -i "s/127.0.0.1/$IP_ADDR/g" {} \;
     find . -name '*.config' -exec sed -i "s/localhost/$IP_ADDR/g" {} \;
+
 fi
 
 # Options required for reflective access in dynamic JVM languages like Groovy and Jython

installer/resources/blocklist.txt

@@ -122,9 +122,12 @@ Sybil:163.44.149.31
 Sybil:178.21.164.0/24
 Sybil:185.69.185.0/24
 Sybil:185.69.186.0/24
+Tunnels:185.213.155.252
+NetDB:186.166.142.51
 Sybil:202.182.126.246
 Sybil:213.142.149.0/24
 Sybil:213.238.166.0/24
+Tunnels:223.167.199.60
 Sybil:2001;df6;b800;1128;a163;44;149;310
 Sybil:2001;19f0;4400;4376;5400;ff;fe47;bcbd
 Sybil:2001;19f0;5801;1d4;5400;ff;fe38;a26e
@@ -138,7 +141,93 @@ Sybil:2400;8500;1302;819;a150;95;134;1590
 Sybil:2400;8500;1302;824;a150;95;144;951
 Sybil:2400;8500;1302;825;150;95;147;89
 Sybil:2400;8500;1302;828;a150;95;153;2202
+Tunnels:2a03;1b20;6;f011;0;0;0;a02e
 Tunnels:JbifzqZZqeTXtxK6KDqNUPWaW-phKqeS~tfJT82SIYI=
 Tunnels:QPUV1bW6arN2zp3gTBMvOEvgSuKbXUqk2oqHkb~UoSw=
 Tunnels:CyLg6w8lypk1gnAX-CdG8O4NCR86hq8ifge6QKXAoJg=
 Tunnels:DtQsGzkbeR3nilr6ZvywR2O7-f0XaaV~YfHXohqwjgI=
+Tunnels:lam824jtkYq4qTiZHT~TkdHoVTVRwnLghgFheZbgDhU=
+Tunnels:Qqj3p9F0Y~qXAkSz3FYo~e~OfSgaM5qZ2OYUrzOtrgM=
+Tunnels:NUo2wncm49XY8f~dzdxII5fnVopL9oT92KC9JC3IOFY=
+Tunnels:GEpq15rG0XjIvP7oZCW9cmL8Dhb8eLSweTU3hZuT2fE=
+Tunnels:aNBK4IQwYCejjMnD31hapWQvova~u1OINPnHCqceljw=
+Tunnels:6lWUeurYBX4w6lsfPdkAxbFKXoGEXKxofXwlWOC3RQA=
+Tunnels:xKAdoKJUvrSEGS0gREC4lEUawa4IKsVnQU189X~QQhk=
+Tunnels:2EJgHsXnjQo8gHt-jmS-GlhXjqtHnNgWiK~QyQ0Rsh4=
+Tunnels:o-atVIIK0N2Eu6r2Nq42cAVqlK6wJGrXqU0Ps3x0HmY=
+Tunnels:2C-fFbGjOJks1mDYxlQ~~M3Q-tX9Dx~tyAUHPzfct~E=
+NetDB:Qc5rvLavMYNhzQBQfBgFkZbesEvGW~3nz1ZwllR1MoM=
+0bLUiXtgYCzAy3533C~wjaUxUkH63JGSRlx2huH-6Bo=
+3~ZOYyQFJAJXxuynetnoijOFjliGGmN9kZ5BkiSupy0=
+4V3EsOGTWrIXJDNaGpOLZrnSGWgSxwgZ7Tsxb0txFtE=
+4yr5497JpDG-K7s1unMbvWBPPfds72Qw27DNH9FpcKQ=
+5MAAvwKgnG7hYbi93q0Luro~-AyIjO5xvUbABc2T3IU=
+5SI8wX-KUefASp0KbjuQ2KaCyZboFHcsXsgwaONVqzc=
+6lKXyJfzTrrt2B7R-p24FSMQQHmyPBb1JSp1N49wdrM=
+6yUKWdxJKF0wtxd3Ro0VfkSlLe74gvM2b0IJbzm~mT0=
+7NzcMy-ty6WICyPHbYBuGQlbcMs7dV-5lN2HIZ-PvuY=
+9ELLjPmb9PBMTOeXqMsRmRfLRlctQMELTZFrkDBOiVA=
+AQ2Wq8Guob3CI1jve~W5wErlaaSF-iZz9mhzKsFmWeo=
+BhqgIK5aTiL8UosUjmBMsCl5NtNCFCZTu0wUSFt0Mkg=
+cC8PmCV4AehT0hKPAfp3yP1DYJKFxmWBk8JWSVZT8Oo=
+cfhT8b5PNxSIFhmg-6ZvP78W5eD9jtGBLjM~oIRRqoE=
+fGe1bjAyj-V0kRJmbXbCGp9y0ZVkYDZksdvfBwo2nME=
+G7d8g3yIjMTG1M6ui1zWf-YYYe0K3Pz8dCg~gRHM-KI=
+Giy8ehFNw~RyB5KV5BCMzgMUMxVI2hiWFS3gdWPthCA=
+HPDYhgrDNJK0STyIJM-A3Q~aMU9D63P-7Bw-Qs15Bmk=
+I5rpywP3dJsP1bfKzp-QUsRCNgT2sO7sTqxuH8~AjmQ=
+ioBAP6QWbWpzkUbmpKn2eWe~XlNmFuIsTJxvstMt2hU=
+jizbTEmYpthOrW2louGRyR057W9G4vcOKtvk~lPqvYg=
+JtgxUY6P7VcgJV3HQUzAaUSVInTR20PT8E34xvwkEck=
+kISWAKZmX0n9C~vQ19oTdL9iWdLs1BfDrssNiZunubw=
+krZK4oqwsee2Qsevb9b9n5jGuNrVaTJlt-nE8G8ft5w=
+lj1A58-iv9W4V9r-jrHZISKncWlSYaQCYvQcBvZppEg=
+N9GkaK294wlSRKaUicSimnxDwebUWKggFlrBUpe00KA=
+Oy4ZaiVxxel1XAWW1p23JlekMGEFvWbWuizQMRnG~tc=
+q1rjeEo0hB61qIcER59aEdQWsX8-gpW-K862deAJkp0=
+QYkhWCudqWhty-TvJ-sFd0z5uLYBXHW5t61L-I6ltJU=
+RDX~26d6ugO1C-DEhkEzPQaGHurvfgKL0cXZlqr4C6Y=
+RjBVJtLfMhLgaSNDpv-D4UqybO5GWSgtcJqAqqd6L~Q=
+S7-xKQ1wSqiqmjODZrTWprTD1L0dtiZlwT055DArGFw=
+SdXmd046uxhAvscEM7ogR6HtH2eWBiyo4~XOnj3dr7c=
+Sm6IkscEdA0vBy9Cx~VQcgB2f5e0fvQ2CEu8fkceL1s=
+tFv6N4kwPdOlMXo8VqoOO3UrSsWAg~-5nadozzBm2Tc=
+TJwtpwSS7yANCDPDfbGdx3f4lDQNYcfA-0X75jHbbNU=
+w~1a6nvIBJfFHGur0mPJmjlwjSBOrWGTC-INPEesPJ0=
+wMIJ9Ax~4kW-jkFQLTHfzSSBqaMSy3EKiBH8YUQjAVA=
+wPorvAjMYj6FipnUHruA0dF2K-Xm~GngCY3QDIVlZyU=
+wWP~J-g-e8Fok7NpTURpJJfeNTGB5S7F15QshyRn9n0=
+X52PGfb8TysUDO7pvQIKGeoPcmWx4jwQJjoHLDD7A5Y=
+xirj-SFuNcYapYv7vnkfa2peqqCzuWeKeUB937Odl3s=
+xXvAxpq~FFyNx9bm6XlPVXNQ7vYfGkjC7nj0xWvNjwE=
+YbIKZpPSqdohVjzi8s~N-D0t~bbayKM4hHcBk-fcJvY=
+ynL10zIHBslFPSf1cmAONogYvNm1WrZ9bgE0txHzOr4=
+YSfLfZVPUvvyQtAltBSJ2RHcU~uTiV0x0H4y~QIPczc=
+ZTOVAP9GJYEKu8CjCQBmOigw79oyTVpQQguTDqwv2EU=
+-xH2G0zblY4mRQxeb1WtXAJwyy8hlsrqpY3~fgPBnoU=
+~CrJVoN00MNvEjZIWudnWFzjqDPDsZxKuFq1Y~Sh8fo=
+3.225.127.222
+3.234.89.179
+5.250.198.133
+18.210.78.199
+31.155.206.27
+38.242.206.110
+44.210.192.47
+46.53.244.68
+52.70.234.81
+77.165.6.8
+93.235.73.128
+98.15.244.49
+109.197.204.101
+109.197.205.47
+139.59.133.151
+145.239.83.230
+162.55.230.167
+172.6.174.68
+174.27.149.30
+176.88.62.2
+185.209.196.0/24
+185.65.134.0/24
+186.166.142.51
+193.32.249.139
+2a03;1b20;6;f011;0;0;0;a07e