diff --git a/core/java/src/net/i2p/time/BuildTime.java b/core/java/src/net/i2p/time/BuildTime.java index ff629cc9a..a21261d42 100644 --- a/core/java/src/net/i2p/time/BuildTime.java +++ b/core/java/src/net/i2p/time/BuildTime.java @@ -34,10 +34,10 @@ public class BuildTime { private static final long _latestTime; private static final long YEARS_25 = 25L*365*24*60*60*1000; /** update this periodically */ - private static final String EARLIEST = "2024-07-10 12:00:00 UTC"; + private static final String EARLIEST = "2024-10-04 12:00:00 UTC"; // fallback if parse fails ticket #1976 // date -d 202x-xx-xx +%s - private static final long EARLIEST_LONG = 1720569600 * 1000L; + private static final long EARLIEST_LONG = 1728000000 * 1000L; static { // this is the standard format of build.timestamp as set in the top-level build.xml diff --git a/installer/resources/GeoLite2-Country.mmdb.gz b/installer/resources/GeoLite2-Country.mmdb.gz index 20bcc6936..0ac548dc9 100644 Binary files a/installer/resources/GeoLite2-Country.mmdb.gz and b/installer/resources/GeoLite2-Country.mmdb.gz differ diff --git a/installer/resources/blocklist-tor.txt b/installer/resources/blocklist-tor.txt index 4a5eb55b2..bb387fd0f 100644 --- a/installer/resources/blocklist-tor.txt +++ b/installer/resources/blocklist-tor.txt @@ -1,22 +1,22 @@ # https://check.torproject.org/torbulkexitlist -# 15 July 2024 +# 04 October 2024 +2.56.10.36 2.58.56.35 2.58.56.43 2.58.56.90 2.58.56.220 2.58.56.248 -2.58.95.35 -2.58.95.38 5.2.67.226 5.2.72.110 -5.2.79.179 5.2.79.190 5.34.182.203 5.42.80.232-5.42.80.235 5.45.98.162 5.45.102.93 5.45.104.176 +5.61.51.143 5.79.66.19 +5.104.86.6 5.181.80.107 5.182.86.212 5.196.8.113 @@ -31,57 +31,61 @@ 5.255.99.147 5.255.100.26 5.255.100.219 -5.255.103.190 +5.255.100.224 +5.255.100.227 +5.255.101.10 5.255.103.235 5.255.104.202 5.255.111.64 -5.255.113.143 5.255.114.171 5.255.115.58 5.255.117.56 +5.255.118.183 5.255.118.244 -5.255.121.179 +5.255.120.205 +5.255.121.71 +5.255.123.158 5.255.123.164 5.255.124.150 5.255.125.41 5.255.125.196 5.255.127.222 -23.26.133.152 +8.218.9.41 +15.204.224.241 +15.204.238.148 23.94.211.25 +23.129.64.131-23.129.64.150 +23.129.64.171-23.129.64.173 +23.129.64.211-23.129.64.230 23.137.248.100 -23.137.250.34 23.137.250.83 23.137.253.27 23.137.253.108-23.137.253.110 -23.152.24.77 +23.153.248.33-23.153.248.34 23.154.177.2-23.154.177.31 23.155.8.104 23.155.24.4 -23.155.24.6 -23.236.122.62 24.240.72.170 27.255.75.198 31.42.185.134 31.129.22.65 31.133.0.210 +31.220.75.237 35.0.127.52 -37.1.201.144 37.48.70.156 37.114.41.119 -37.120.190.85 37.120.239.59 37.187.5.192 -37.220.86.167 +37.187.74.97 37.228.129.5 37.228.129.63 37.228.129.128 -37.252.254.33 38.97.116.244 -38.152.53.242-38.152.53.246 -38.152.53.250-38.152.53.254 -41.216.183.87 +43.157.40.39 45.8.22.207 +45.9.148.113 45.11.59.28 +45.11.229.132 45.12.3.80 45.15.157.177 45.61.185.172 @@ -89,35 +93,41 @@ 45.61.187.200 45.66.35.10 45.66.35.20-45.66.35.22 -45.66.35.35 -45.79.50.161 +45.66.35.31-45.66.35.35 45.79.144.222 -45.79.177.21 +45.80.158.23 45.80.158.27 45.80.158.205 +45.82.102.158 45.83.104.137 -45.84.0.123 45.94.31.68 45.94.31.180 -45.95.169.223-45.95.169.230 +45.95.169.130 +45.95.169.223-45.95.169.229 45.95.169.255 +45.95.202.48 45.118.133.44 +45.128.133.242 +45.129.84.246 +45.129.84.249 45.132.246.245 -45.133.16.36 45.134.225.36 -45.135.132.20 +45.137.205.138 +45.137.205.140 45.138.16.42 45.138.16.76 45.138.16.107 45.138.16.113 -45.138.16.142 -45.138.16.203 +45.138.16.178 45.138.16.222 45.138.16.230 45.138.16.240 45.138.16.249 45.139.122.176 +45.141.215.17 +45.141.215.19 45.141.215.21 +45.141.215.40 45.141.215.56 45.141.215.61-45.141.215.63 45.141.215.80-45.141.215.81 @@ -127,44 +137,43 @@ 45.141.215.97 45.141.215.110-45.141.215.111 45.141.215.114 +45.141.215.116 45.141.215.167 45.141.215.169 45.148.10.111 +45.148.10.169 45.151.122.34 +46.29.238.177 46.38.255.27 46.165.243.36 46.182.21.248 -46.195.240.9 -46.195.242.161 -46.226.105.168 -46.226.164.14 46.232.251.191 46.234.47.105 -47.250.38.29 +47.76.187.86 +47.243.99.161 +49.51.172.44 51.15.59.15 51.38.81.135 51.38.113.118 51.38.225.46 +51.81.33.188 51.81.222.62 51.81.254.14 +51.89.138.51 51.89.153.112 51.91.18.151 -51.178.45.216 51.195.166.174 -51.222.84.46 51.222.136.218 51.222.142.67 54.36.101.21 54.36.108.162 54.36.209.253-54.36.209.254 +62.63.244.28 62.133.45.2 62.171.137.169 -62.182.83.179 +62.182.83.214 62.182.84.146 -64.226.89.91 64.227.115.78 -66.78.40.102 -66.78.40.182 66.146.193.33 66.220.242.222 67.219.109.141 @@ -174,24 +183,23 @@ 72.211.49.235 74.82.47.194 77.37.3.7 -77.48.28.204 -77.48.28.236-77.48.28.237 +77.48.28.237 77.48.28.239 +77.68.16.129 77.81.247.72 +77.83.246.112 77.91.85.147 77.91.86.95 77.91.87.79 -77.105.133.7 77.105.146.42 77.220.196.253 +77.221.152.105 77.221.157.237 77.221.159.75 77.221.159.184 77.221.159.189 77.221.159.192-77.221.159.193 78.142.18.219 -79.102.150.51 -79.124.8.241 79.137.198.213 80.67.167.81 80.67.172.162 @@ -201,55 +209,45 @@ 80.241.60.207 81.16.33.42 81.17.28.95 -82.118.242.36 -82.153.138.24 +82.85.247.254 +82.118.242.62 82.153.138.119 -82.153.138.208 -82.197.182.161 82.221.128.191 82.221.131.5 82.221.139.190 83.96.213.63 83.97.20.77 -83.97.20.115 -83.97.20.251 83.217.9.73 84.16.224.227 +84.19.182.20 84.211.225.54 84.239.46.144 84.247.165.51 84.252.120.163 +84.252.121.147 85.17.9.83 85.93.218.204 -85.204.116.92-85.204.116.93 -85.215.76.62 85.239.41.130 -86.104.194.13 -86.104.194.27 +86.104.73.167 +86.205.5.107 87.118.110.27 87.118.116.90 87.118.116.103 87.118.122.30 87.118.122.51 87.120.254.132 -87.120.254.192 88.80.20.86 -88.209.197.213 -89.36.231.128 +89.37.95.34 89.58.18.210 89.58.26.216 89.58.41.156 89.58.41.251 89.58.63.200 89.147.108.90 -89.147.108.209 -89.147.109.226 89.147.110.82 89.147.110.118 89.147.110.154 89.147.110.202 -89.147.110.214 -89.147.111.87 89.147.111.124 89.185.85.140 89.234.157.254 @@ -268,28 +266,28 @@ 91.208.75.156 91.208.75.178 91.208.75.239 -91.208.206.47 91.210.59.57 91.219.236.101 +91.219.237.39 91.219.237.56 91.219.239.166 -92.133.238.108 92.243.24.163 92.246.84.133 92.246.138.145 -93.90.74.31 -93.95.225.141 +93.8.245.134 93.95.228.125 93.95.228.205 93.95.230.165 93.95.231.14 93.95.231.88 93.99.104.18 +93.99.104.40 93.99.104.128 93.99.104.194 93.123.12.112 -93.123.12.240 +93.185.165.211 94.16.112.22 +94.16.115.121 94.16.116.81 94.16.116.86 94.16.121.91 @@ -297,14 +295,11 @@ 94.32.66.15 94.75.225.81 94.102.51.15 -94.140.115.63 +94.131.3.2 94.142.241.194 94.142.244.16 -94.158.246.64 -94.177.106.37 -94.177.106.46 -94.177.106.54-94.177.106.55 -94.177.106.59 +94.143.231.53 +94.158.246.66 94.177.106.247 94.228.163.25 94.228.169.70 @@ -312,11 +307,9 @@ 95.128.43.164 95.142.161.63 95.143.193.125 -95.164.4.104 -95.164.46.204 -95.168.173.143 95.211.244.28 96.27.198.133 +96.66.15.152 96.126.98.146 98.128.173.33 102.130.113.9 @@ -325,15 +318,12 @@ 103.28.52.93 103.109.101.105 103.126.161.54 -103.129.222.46 103.163.218.11 -103.172.134.26 -103.193.179.233 +103.164.54.199 103.196.37.111 103.208.86.5 103.251.167.10 103.251.167.20 -103.253.24.18 104.167.242.116-104.167.242.118 104.192.1.138 104.192.3.74 @@ -355,6 +345,8 @@ 104.244.79.44 104.244.79.50 104.244.79.61 +107.172.31.218 +107.173.179.59 107.174.138.172 107.189.1.9 107.189.1.80 @@ -363,6 +355,7 @@ 107.189.1.175 107.189.1.198 107.189.2.108 +107.189.2.206 107.189.3.11 107.189.3.94 107.189.3.148 @@ -373,9 +366,8 @@ 107.189.5.7 107.189.5.18-107.189.5.19 107.189.5.121 -107.189.6.57 +107.189.6.36 107.189.6.124 -107.189.6.246 107.189.7.47 107.189.7.114 107.189.7.141 @@ -386,6 +378,7 @@ 107.189.8.16 107.189.8.56 107.189.8.65 +107.189.8.70 107.189.8.133 107.189.8.136 107.189.8.181 @@ -395,6 +388,7 @@ 107.189.11.111 107.189.11.113 107.189.12.3 +107.189.12.7 107.189.12.88 107.189.13.91 107.189.13.180 @@ -403,17 +397,18 @@ 107.189.14.4 107.189.14.43 107.189.14.106 -107.189.28.199 107.189.29.103 +107.189.29.184 +107.189.30.49 107.189.30.69 107.189.30.86 107.189.30.236 107.189.31.33 107.189.31.187 -107.189.31.225 107.189.31.232 108.61.158.147 108.61.189.136 +108.181.16.251 108.181.27.205 108.181.69.243 108.181.124.143 @@ -422,64 +417,66 @@ 109.70.100.65-109.70.100.71 109.104.153.22 109.169.33.163 -109.248.144.73 -109.248.147.137 +114.35.245.150 118.163.74.160 -121.78.28.175 123.253.35.32 125.212.241.131 128.31.0.13 128.127.180.156 -130.193.15.79 +130.0.233.34 +130.0.236.83 +130.193.10.21 130.193.15.186 -135.125.205.25 136.244.111.163 138.59.18.110 139.99.8.57 139.99.172.11 139.162.249.209 -141.95.59.92-141.95.59.93 141.98.11.62 141.98.119.106 141.239.146.142 142.44.133.81 142.44.234.69 +142.171.12.88 143.110.156.176 144.24.197.112 144.172.118.4 144.172.118.55 -144.172.118.76 -144.172.118.90 146.59.35.38 146.59.35.246 -146.70.146.26 +146.70.81.186 146.70.164.210 -147.45.49.17 +146.70.198.38 147.45.78.34 147.45.116.145 +147.78.67.73 +148.113.152.91 149.56.22.133 149.56.44.47 -149.202.32.9 149.202.79.101 149.202.79.129 151.80.148.159 -152.89.233.169 -154.16.116.61 154.26.159.157 +154.40.44.183 +154.213.185.133 +154.213.185.165 +154.213.185.183 +154.213.185.185 +154.213.185.230 +154.213.185.254 155.138.161.171 -156.67.111.146 160.119.249.240 -162.19.230.94 +161.35.129.51 +162.216.18.62 162.247.72.192 162.247.72.199 162.247.74.7 162.247.74.27 -162.247.74.74 162.247.74.200-162.247.74.202 162.247.74.204 162.247.74.206 162.247.74.213 -162.247.74.216-162.247.74.217 +162.247.74.216 162.251.5.152 163.5.143.76 163.172.45.102 @@ -490,27 +487,33 @@ 171.25.193.25 171.25.193.77-171.25.193.80 171.25.193.234-171.25.193.235 +172.81.131.110-172.81.131.111 172.81.131.139 172.81.131.156 172.81.132.94 172.104.164.133 +172.104.176.218 172.104.182.84 -172.104.214.41 +172.104.243.155 172.105.161.162 -172.232.164.52 -172.235.29.198 -173.249.57.253 +172.232.173.127 +172.234.120.235 +172.234.228.174 +173.0.3.111 +173.255.198.243 176.58.89.182 176.58.100.98 176.58.121.177 +176.97.114.182 176.97.114.202 176.118.193.33 176.121.81.51 176.126.253.190 +176.227.215.50 +177.149.135.222 178.17.170.23 -178.17.170.71 -178.17.170.125 -178.17.170.169 +178.17.170.144 +178.17.170.215 178.17.171.102 178.17.174.14 178.17.174.164 @@ -518,9 +521,9 @@ 178.20.55.182 178.162.209.56 178.175.131.141 -178.175.142.26 -178.175.148.105 178.175.148.209 +178.175.148.245-178.175.148.246 +178.215.224.65 178.218.144.18 178.218.144.51 178.218.144.64 @@ -529,33 +532,34 @@ 179.43.128.16 179.43.159.78 179.43.159.194-179.43.159.201 -179.43.161.170-179.43.161.174 -179.43.167.99-179.43.167.110 -179.43.167.205 +179.43.167.195 179.43.182.58 179.43.182.232 180.150.226.99 -181.41.143.246 -184.75.223.203 -184.105.48.40 +184.75.221.195 185.7.33.146 -185.11.139.198 -185.14.97.37 185.34.33.2 185.35.202.222 185.38.175.133 185.39.207.83 +185.40.4.29 +185.40.4.38 +185.40.4.92 +185.40.4.94-185.40.4.95 +185.40.4.100-185.40.4.101 +185.40.4.132 +185.40.4.149-185.40.4.150 185.42.170.203 185.56.83.83 185.56.171.94 185.67.82.114 185.82.219.109 -185.84.31.254 185.100.85.22-185.100.85.25 185.100.85.132 185.100.87.41 185.100.87.136 185.100.87.139 +185.100.87.166 185.100.87.174 185.100.87.192 185.100.87.250 @@ -563,8 +567,7 @@ 185.106.94.195 185.106.102.102 185.107.57.64-185.107.57.66 -185.107.70.56 -185.112.83.205 +185.107.69.86 185.112.144.11 185.112.146.167 185.113.128.30 @@ -576,10 +579,8 @@ 185.130.44.108 185.130.47.58 185.132.53.12 -185.141.147.129 185.142.239.49 185.146.232.234 -185.148.3.217 185.153.197.227 185.154.110.17 185.154.110.142 @@ -587,9 +588,6 @@ 185.165.171.84 185.165.190.111 185.170.114.25 -185.181.60.135 -185.181.61.115 -185.181.61.142 185.183.157.214 185.183.159.40 185.191.204.254 @@ -600,24 +598,20 @@ 185.195.237.238 185.207.107.130 185.207.107.216 -185.220.101.0-185.220.101.90 +185.216.68.52 +185.220.100.240-185.220.101.90 185.220.101.96-185.220.101.110 -185.220.101.128 -185.220.101.130 -185.220.101.132-185.220.101.139 -185.220.101.141-185.220.101.147 -185.220.101.149-185.220.101.150 -185.220.101.152-185.220.101.159 -185.220.101.161-185.220.101.164 -185.220.101.166-185.220.101.171 -185.220.101.174-185.220.101.183 -185.220.101.185-185.220.101.191 +185.220.101.128-185.220.101.151 +185.220.101.153-185.220.101.159 +185.220.101.161-185.220.101.166 +185.220.101.168-185.220.101.191 185.220.103.4-185.220.103.9 185.225.69.203 185.225.69.232 185.225.226.181 185.227.68.78 185.227.134.106 +185.230.161.177 185.233.100.23 185.241.208.54 185.241.208.71 @@ -631,15 +625,9 @@ 185.241.208.236 185.241.208.243 185.243.23.81 -185.243.218.35 -185.243.218.41 -185.243.218.46 -185.243.218.61 -185.243.218.89 -185.243.218.95 -185.243.218.110 -185.243.218.202 -185.243.218.204 +185.243.23.152 +185.243.23.157 +185.243.23.177 185.244.192.175 185.244.192.184 185.246.86.197 @@ -648,23 +636,27 @@ 185.246.188.149 185.246.189.77 185.246.189.99 +185.246.189.130 185.247.184.33 185.247.184.105 +185.247.224.143 +185.247.226.206 185.252.232.218 185.254.196.141 +188.68.36.28 188.68.41.191 188.68.49.235 188.68.52.231 188.165.200.97 -188.172.228.41 188.172.229.15 188.214.104.21 188.244.106.81 +188.253.7.63 +188.253.112.49 190.103.179.98 190.120.229.98 190.211.254.97 -191.96.165.34 -192.42.116.14-192.42.116.15 +192.42.116.13-192.42.116.15 192.42.116.17-192.42.116.20 192.42.116.22-192.42.116.28 192.42.116.173-192.42.116.187 @@ -675,43 +667,49 @@ 192.108.48.150 193.26.115.43 193.26.115.61 -193.35.18.49 -193.35.18.77 -193.35.18.105 +193.31.31.89 +193.36.38.17 +193.41.226.117 +193.70.80.213 193.105.134.150 193.105.134.155 +193.142.146.139 +193.142.147.69 +193.142.147.233 193.168.141.173 -193.168.143.161 -193.189.100.194-193.189.100.206 +193.182.96.246 +193.189.100.194-193.189.100.197 +193.189.100.199-193.189.100.206 193.218.118.89 193.218.118.133 -193.218.118.161 +193.218.118.155 193.218.118.173 193.218.118.178 193.218.118.182 193.218.118.188 +193.233.48.43 193.233.133.109 -193.239.232.230 +193.239.232.102 194.15.112.133 194.15.113.118 194.15.115.212 194.26.192.77 +194.26.192.161 194.62.248.21 194.163.157.49 194.164.122.21 194.233.174.56 -195.26.247.0 195.80.151.242 195.88.74.206 195.160.220.104 -195.176.3.19-195.176.3.20 195.176.3.23-195.176.3.24 -198.46.166.157 +198.54.132.107 +198.54.132.139 198.58.107.53 198.96.155.3 -198.98.48.20 198.98.48.31 198.98.48.33 +198.98.48.35 198.98.50.199 198.98.50.215 198.98.51.52 @@ -719,10 +717,9 @@ 198.98.51.249 198.98.52.24 198.98.53.136 -198.98.54.34 198.98.54.49 198.98.60.90 -198.154.93.66 +199.7.140.230 199.195.248.184 199.195.249.214 199.195.250.18 @@ -741,15 +738,16 @@ 201.23.14.225 201.23.16.249 202.61.226.98 -202.94.246.210 202.182.99.129 -204.8.96.120 +204.8.96.64-204.8.96.89 +204.8.96.100-204.8.96.123 +204.8.96.140-204.8.96.189 204.8.156.142 -204.27.64.10 204.85.191.7-204.85.191.9 204.137.14.92 204.137.14.104-204.137.14.106 204.194.29.4 +205.185.113.85 205.185.113.180 205.185.116.34 205.185.117.149 @@ -759,19 +757,21 @@ 205.185.124.176 205.185.124.193 205.185.127.231 -209.135.168.10 -209.135.168.56 +209.141.32.181 209.141.32.198 +209.141.36.191 +209.141.36.247 209.141.37.94 209.141.46.203 -209.141.50.178 209.141.51.30 209.141.51.180 209.141.54.203 209.141.55.26 209.141.59.116 +209.141.60.219 209.141.62.71 212.21.66.6 +212.38.189.186 212.69.167.80 212.73.134.204 212.95.50.77 @@ -781,4 +781,6 @@ 216.73.159.75 216.73.159.101 217.12.221.131 +217.79.189.239 217.146.2.41 +217.197.107.138 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f40b3641a..5f09da78e 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -20,7 +20,7 @@ public class RouterVersion { public final static String VERSION = CoreVersion.VERSION; /** for example: "beta", "alpha", "rc" */ public final static String QUALIFIER = "-rc"; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + QUALIFIER + EXTRA;