[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [stem/master] Sort fallbacks by fingerprint
commit 3fc8c854b9ec29fe4f6c05a2dfc1678570d8c746
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date: Mon Oct 31 19:37:26 2016 -0700
Sort fallbacks by fingerprint
Updating our fallback directories caused a big delta, not because of the
changes but because we have a random ordering. Sorting our config file by the
fallback fingerprints so we have small deltas in the future.
Only functional change to the config file is the following to get us in sync...
* Removed FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64 as a fallback directory
* Removed 14419131033443AE6E21DA82B0D307F7CAE42BDB as a fallback directory
* Removed 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 as a fallback directory
* Removed 29F1020B94BE25E6BE1AD13E93CE19D2131B487C as a fallback directory
* Removed E781F4EC69671B3F1864AE2753E0890351506329 as a fallback directory
* Removed DE134FC8E5CC4EC8A5DE66934E70AC9D70267197 as a fallback directory
* Removed 6A640018EABF3DA9BAD9321AA37C2C87BBE1F907 as a fallback directory
* Removed 6FC6F08270D565BE89B7C819DD8E2D487397C073 as a fallback directory
---
cache_fallback_directories.py | 2 +-
stem/descriptor/fallback_directories.cfg | 502 +++++++++++++++----------------
test/unit/descriptor/remote.py | 2 +-
3 files changed, 239 insertions(+), 267 deletions(-)
diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py
index cd613e4..79f21eb 100755
--- a/cache_fallback_directories.py
+++ b/cache_fallback_directories.py
@@ -54,7 +54,7 @@ if __name__ == '__main__':
conf.set('tor_commit', fallback_dir_commit)
conf.set('stem_commit', stem_commit)
- for directory in latest_fallback_directories.values():
+ for directory in sorted(latest_fallback_directories.values(), lambda x, y: cmp(x.fingerprint, y.fingerprint)):
fingerprint = directory.fingerprint
conf.set('%s.address' % fingerprint, directory.address)
conf.set('%s.or_port' % fingerprint, str(directory.or_port))
diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg
index 94d9fcb..af2ff70 100644
--- a/stem/descriptor/fallback_directories.cfg
+++ b/stem/descriptor/fallback_directories.cfg
@@ -1,117 +1,234 @@
-tor_commit 1c4a2dd208601aca9fdd004929c283b9d44d7442
-stem_commit 3d0e999f8073bed67d84bb863560078e923a8b57
-823AA81E277F366505545522CEDC2F529CE4DC3F.address 192.160.102.164
-823AA81E277F366505545522CEDC2F529CE4DC3F.or_port 9001
-823AA81E277F366505545522CEDC2F529CE4DC3F.dir_port 80
-AEA43CB1E47BE5F8051711B2BF01683DB1568E05.address 37.187.7.74
-AEA43CB1E47BE5F8051711B2BF01683DB1568E05.or_port 443
-AEA43CB1E47BE5F8051711B2BF01683DB1568E05.dir_port 80
-AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_address 2001:41d0:a:74a::1
-AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_port 443
-8664DC892540F3C789DB37008236C096C871734D.address 163.172.138.22
-8664DC892540F3C789DB37008236C096C871734D.or_port 443
-8664DC892540F3C789DB37008236C096C871734D.dir_port 80
+tor_commit 30275b048f1c541b99c13808915f49671196fc7f
+stem_commit 3c3fc11c6bb0ef7bcc3ebd12f2a055b0950dcfac
+01A9258A46E97FF8B2CAC7910577862C14F2C524.address 193.171.202.146
+01A9258A46E97FF8B2CAC7910577862C14F2C524.or_port 9001
+01A9258A46E97FF8B2CAC7910577862C14F2C524.dir_port 9030
+0756B7CD4DFC8182BE23143FAC0642F515182CEB.address 5.9.110.236
+0756B7CD4DFC8182BE23143FAC0642F515182CEB.or_port 9001
+0756B7CD4DFC8182BE23143FAC0642F515182CEB.dir_port 9030
+0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_address 2a01:4f8:162:51e2::2
+0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_port 9001
+0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.address 5.39.92.199
+0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.or_port 443
+0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.dir_port 80
+0C2C599AFCB26F5CFC2C7592435924C1D63D9484.address 5.196.88.122
+0C2C599AFCB26F5CFC2C7592435924C1D63D9484.or_port 9001
+0C2C599AFCB26F5CFC2C7592435924C1D63D9484.dir_port 9030
+0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.address 178.62.197.82
+0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.or_port 443
+0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.dir_port 80
+17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.address 178.32.216.146
+17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.or_port 9001
+17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.dir_port 9030
+1DBAED235E3957DE1ABD25B4206BE71406FB61F8.address 46.101.151.222
+1DBAED235E3957DE1ABD25B4206BE71406FB61F8.or_port 443
+1DBAED235E3957DE1ABD25B4206BE71406FB61F8.dir_port 80
+1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.address 91.219.237.229
+1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.or_port 443
+1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.dir_port 80
+20462CBA5DA4C2D963567D17D0B7249718114A68.address 212.47.229.2
+20462CBA5DA4C2D963567D17D0B7249718114A68.or_port 9001
+20462CBA5DA4C2D963567D17D0B7249718114A68.dir_port 9030
+2541759BEC04D37811C2209A88E863320271EC9C.address 185.61.138.18
+2541759BEC04D37811C2209A88E863320271EC9C.or_port 4443
+2541759BEC04D37811C2209A88E863320271EC9C.dir_port 8080
+2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.address 144.76.26.175
+2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.or_port 9011
+2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.dir_port 9012
+2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.address 62.210.124.124
+2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.or_port 9101
+2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.dir_port 9130
+2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_address 2001:bc8:3f23:100::1
+2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_port 9101
+30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.address 213.61.66.118
+30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.or_port 9001
+30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.dir_port 9031
+322C6E3A973BC10FC36DE3037AD27BC89F14723B.address 212.83.154.33
+322C6E3A973BC10FC36DE3037AD27BC89F14723B.or_port 8443
+322C6E3A973BC10FC36DE3037AD27BC89F14723B.dir_port 8080
+32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.address 109.105.109.162
+32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.or_port 60784
+32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.dir_port 52860
+32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_address 2001:948:7:2::163
+32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_port 5001
+35E8B344F661F4F2E68B17648F35798B44672D7E.address 146.0.32.144
+35E8B344F661F4F2E68B17648F35798B44672D7E.or_port 9001
+35E8B344F661F4F2E68B17648F35798B44672D7E.dir_port 9030
+361D33C96D0F161275EE67E2C91EE10B276E778B.address 217.79.190.25
+361D33C96D0F161275EE67E2C91EE10B276E778B.or_port 9090
+361D33C96D0F161275EE67E2C91EE10B276E778B.dir_port 9030
387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.address 62.210.92.11
387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.or_port 9101
387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.dir_port 9130
387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.orport6_address 2001:bc8:338c::1
387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.orport6_port 9101
-DE134FC8E5CC4EC8A5DE66934E70AC9D70267197.address 195.191.233.221
-DE134FC8E5CC4EC8A5DE66934E70AC9D70267197.or_port 443
-DE134FC8E5CC4EC8A5DE66934E70AC9D70267197.dir_port 80
-5714542DCBEE1DD9864824723638FD44B2122CEA.address 109.163.234.9
-5714542DCBEE1DD9864824723638FD44B2122CEA.or_port 443
-5714542DCBEE1DD9864824723638FD44B2122CEA.dir_port 80
+39F096961ED2576975C866D450373A9913AFDC92.address 198.50.191.95
+39F096961ED2576975C866D450373A9913AFDC92.or_port 443
+39F096961ED2576975C866D450373A9913AFDC92.dir_port 80
+3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.address 164.132.77.175
+3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.or_port 9001
+3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.dir_port 9030
+3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.address 176.10.107.180
+3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.or_port 9001
+3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.dir_port 9030
+489D94333DF66D57FFE34D9D59CC2D97E2CB0053.address 37.187.102.186
+489D94333DF66D57FFE34D9D59CC2D97E2CB0053.or_port 9001
+489D94333DF66D57FFE34D9D59CC2D97E2CB0053.dir_port 9030
+489D94333DF66D57FFE34D9D59CC2D97E2CB0053.orport6_address 2001:41d0:a:26ba::1
+489D94333DF66D57FFE34D9D59CC2D97E2CB0053.orport6_port 9001
+49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.address 188.165.194.195
+49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.or_port 9001
+49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.dir_port 9030
+4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.address 108.53.208.157
+4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.or_port 443
+4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.dir_port 80
50586E25BE067FD1F739998550EDDCB1A14CA5B2.address 212.51.134.123
50586E25BE067FD1F739998550EDDCB1A14CA5B2.or_port 9001
50586E25BE067FD1F739998550EDDCB1A14CA5B2.dir_port 9030
50586E25BE067FD1F739998550EDDCB1A14CA5B2.orport6_address 2a02:168:6e00:0:3a60:77ff:fe9c:8bd1
50586E25BE067FD1F739998550EDDCB1A14CA5B2.orport6_port 9001
-BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.address 198.96.155.3
-BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.or_port 5001
-BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.dir_port 8080
-F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.address 94.242.246.23
-F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.or_port 9001
-F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.dir_port 443
-F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.orport6_address 2a01:608:ffff:ff07::1:23
-F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.orport6_port 9003
-616081EC829593AF4232550DE6FFAA1D75B37A90.address 95.128.43.164
-616081EC829593AF4232550DE6FFAA1D75B37A90.or_port 443
-616081EC829593AF4232550DE6FFAA1D75B37A90.dir_port 80
-616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_address 2a02:ec0:209:10::4
-616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_port 443
+5665A3904C89E22E971305EE8C1997BCA4123C69.address 94.23.204.175
+5665A3904C89E22E971305EE8C1997BCA4123C69.or_port 9001
+5665A3904C89E22E971305EE8C1997BCA4123C69.dir_port 9030
+5714542DCBEE1DD9864824723638FD44B2122CEA.address 109.163.234.9
+5714542DCBEE1DD9864824723638FD44B2122CEA.or_port 443
+5714542DCBEE1DD9864824723638FD44B2122CEA.dir_port 80
58ED9C9C35E433EE58764D62892B4FFD518A3CD0.address 185.21.100.50
58ED9C9C35E433EE58764D62892B4FFD518A3CD0.or_port 9001
58ED9C9C35E433EE58764D62892B4FFD518A3CD0.dir_port 9030
58ED9C9C35E433EE58764D62892B4FFD518A3CD0.orport6_address 2a00:1158:2:cd00:0:74:6f:72
58ED9C9C35E433EE58764D62892B4FFD518A3CD0.orport6_port 443
-35E8B344F661F4F2E68B17648F35798B44672D7E.address 146.0.32.144
-35E8B344F661F4F2E68B17648F35798B44672D7E.or_port 9001
-35E8B344F661F4F2E68B17648F35798B44672D7E.dir_port 9030
-14419131033443AE6E21DA82B0D307F7CAE42BDB.address 144.76.14.145
-14419131033443AE6E21DA82B0D307F7CAE42BDB.or_port 143
-14419131033443AE6E21DA82B0D307F7CAE42BDB.dir_port 110
-14419131033443AE6E21DA82B0D307F7CAE42BDB.orport6_address 2a01:4f8:190:9490::dead
-14419131033443AE6E21DA82B0D307F7CAE42BDB.orport6_port 443
+5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.address 78.142.142.246
+5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.or_port 443
+5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.dir_port 80
+5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.address 178.16.208.62
+5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.or_port 443
+5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.dir_port 80
+5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.orport6_address 2a00:1c20:4089:1234:a6a4:2926:d0af:dfee
+5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.orport6_port 443
+616081EC829593AF4232550DE6FFAA1D75B37A90.address 95.128.43.164
+616081EC829593AF4232550DE6FFAA1D75B37A90.or_port 443
+616081EC829593AF4232550DE6FFAA1D75B37A90.dir_port 80
+616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_address 2a02:ec0:209:10::4
+616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_port 443
+64186650FFE4469EBBE52B644AE543864D32F43C.address 89.187.142.208
+64186650FFE4469EBBE52B644AE543864D32F43C.or_port 443
+64186650FFE4469EBBE52B644AE543864D32F43C.dir_port 80
+7350AB9ED7568F22745198359373C04AC783C37C.address 176.31.191.26
+7350AB9ED7568F22745198359373C04AC783C37C.or_port 9001
+7350AB9ED7568F22745198359373C04AC783C37C.dir_port 9030
+75F1992FD3F403E9C082A5815EB5D12934CDF46C.address 46.101.237.246
+75F1992FD3F403E9C082A5815EB5D12934CDF46C.or_port 9001
+75F1992FD3F403E9C082A5815EB5D12934CDF46C.dir_port 9030
+75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_address 2a03:b0c0:3:d0::208:5001
+75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_port 9050
+794D8EA8343A4E820320265D05D4FA83AB6D1778.address 185.11.180.67
+794D8EA8343A4E820320265D05D4FA83AB6D1778.or_port 9001
+794D8EA8343A4E820320265D05D4FA83AB6D1778.dir_port 80
79E169B25E4C7CE99584F6ED06F379478F23E2B8.address 62.210.129.246
79E169B25E4C7CE99584F6ED06F379478F23E2B8.or_port 443
79E169B25E4C7CE99584F6ED06F379478F23E2B8.dir_port 80
-FD1871854BFC06D7B02F10742073069F0528B5CC.address 192.187.124.98
-FD1871854BFC06D7B02F10742073069F0528B5CC.or_port 9001
-FD1871854BFC06D7B02F10742073069F0528B5CC.dir_port 9030
-EBE718E1A49EE229071702964F8DB1F318075FF8.address 131.188.40.188
-EBE718E1A49EE229071702964F8DB1F318075FF8.or_port 80
-EBE718E1A49EE229071702964F8DB1F318075FF8.dir_port 443
-489D94333DF66D57FFE34D9D59CC2D97E2CB0053.address 37.187.102.186
-489D94333DF66D57FFE34D9D59CC2D97E2CB0053.or_port 9001
-489D94333DF66D57FFE34D9D59CC2D97E2CB0053.dir_port 9030
-489D94333DF66D57FFE34D9D59CC2D97E2CB0053.orport6_address 2001:41d0:a:26ba::1
-489D94333DF66D57FFE34D9D59CC2D97E2CB0053.orport6_port 9001
+7A32C9519D80CA458FC8B034A28F5F6815649A98.address 82.223.21.74
+7A32C9519D80CA458FC8B034A28F5F6815649A98.or_port 9001
+7A32C9519D80CA458FC8B034A28F5F6815649A98.dir_port 9030
+7A32C9519D80CA458FC8B034A28F5F6815649A98.orport6_address 2001:470:53e0::cafe
+7A32C9519D80CA458FC8B034A28F5F6815649A98.orport6_port 9050
+823AA81E277F366505545522CEDC2F529CE4DC3F.address 192.160.102.164
+823AA81E277F366505545522CEDC2F529CE4DC3F.or_port 9001
+823AA81E277F366505545522CEDC2F529CE4DC3F.dir_port 80
+844AE9CAD04325E955E2BE1521563B79FE7094B7.address 192.87.28.82
+844AE9CAD04325E955E2BE1521563B79FE7094B7.or_port 9001
+844AE9CAD04325E955E2BE1521563B79FE7094B7.dir_port 9030
+8664DC892540F3C789DB37008236C096C871734D.address 163.172.138.22
+8664DC892540F3C789DB37008236C096C871734D.or_port 443
+8664DC892540F3C789DB37008236C096C871734D.dir_port 80
+8844D87E9B038BE3270938F05AF797E1D3C74C0F.address 93.180.156.84
+8844D87E9B038BE3270938F05AF797E1D3C74C0F.or_port 9001
+8844D87E9B038BE3270938F05AF797E1D3C74C0F.dir_port 9030
+9007C1D8E4F03D506A4A011B907A9E8D04E3C605.address 151.80.42.103
+9007C1D8E4F03D506A4A011B907A9E8D04E3C605.or_port 9001
+9007C1D8E4F03D506A4A011B907A9E8D04E3C605.dir_port 9030
+9007C1D8E4F03D506A4A011B907A9E8D04E3C605.orport6_address 2001:41d0:e:f67::114
+9007C1D8E4F03D506A4A011B907A9E8D04E3C605.orport6_port 9001
+9030DCF419F6E2FBF84F63CBACBA0097B06F557E.address 5.79.68.161
+9030DCF419F6E2FBF84F63CBACBA0097B06F557E.or_port 443
+9030DCF419F6E2FBF84F63CBACBA0097B06F557E.dir_port 81
+9030DCF419F6E2FBF84F63CBACBA0097B06F557E.orport6_address 2001:1af8:4700:a012:1::1
+9030DCF419F6E2FBF84F63CBACBA0097B06F557E.orport6_port 443
+9231DF741915AA1630031A93026D88726877E93A.address 51.255.41.65
+9231DF741915AA1630031A93026D88726877E93A.or_port 9001
+9231DF741915AA1630031A93026D88726877E93A.dir_port 9030
+92ECC9E0E2AF81BB954719B189AC362E254AD4A5.address 91.219.237.244
+92ECC9E0E2AF81BB954719B189AC362E254AD4A5.or_port 443
+92ECC9E0E2AF81BB954719B189AC362E254AD4A5.dir_port 80
+98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.address 85.214.206.219
+98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.or_port 9001
+98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.dir_port 9030
99E246DB480B313A3012BC3363093CC26CD209C7.address 81.7.10.93
99E246DB480B313A3012BC3363093CC26CD209C7.or_port 31337
99E246DB480B313A3012BC3363093CC26CD209C7.dir_port 31336
-3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.address 176.10.107.180
-3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.or_port 9001
-3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.dir_port 9030
-D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.address 37.187.115.157
-D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.or_port 9001
-D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.dir_port 9030
+9F7D6E6420183C2B76D3CE99624EBC98A21A967E.address 46.28.110.244
+9F7D6E6420183C2B76D3CE99624EBC98A21A967E.or_port 443
+9F7D6E6420183C2B76D3CE99624EBC98A21A967E.dir_port 80
+A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.address 46.165.230.5
+A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.or_port 443
+A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.dir_port 80
+A10C4F666D27364036B562823E5830BC448E046A.address 171.25.193.77
+A10C4F666D27364036B562823E5830BC448E046A.or_port 443
+A10C4F666D27364036B562823E5830BC448E046A.dir_port 80
+A10C4F666D27364036B562823E5830BC448E046A.orport6_address 2001:67c:289c:3::77
+A10C4F666D27364036B562823E5830BC448E046A.orport6_port 443
+A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.address 176.9.5.116
+A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.or_port 9001
+A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.dir_port 9030
+ABCB4965F1FEE193602B50A365425105C889D3F8.address 192.34.63.137
+ABCB4965F1FEE193602B50A365425105C889D3F8.or_port 443
+ABCB4965F1FEE193602B50A365425105C889D3F8.dir_port 9030
+ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.address 86.59.119.88
+ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.or_port 443
+ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.dir_port 80
+AD253B49E303C6AB1E048B014392AC569E8A7DAE.address 163.172.131.88
+AD253B49E303C6AB1E048B014392AC569E8A7DAE.or_port 443
+AD253B49E303C6AB1E048B014392AC569E8A7DAE.dir_port 80
+AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_address 2001:bc8:4400:2100::2:1009
+AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_port 443
AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.address 178.254.44.135
AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.or_port 443
AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.dir_port 80
-01A9258A46E97FF8B2CAC7910577862C14F2C524.address 193.171.202.146
-01A9258A46E97FF8B2CAC7910577862C14F2C524.or_port 9001
-01A9258A46E97FF8B2CAC7910577862C14F2C524.dir_port 9030
-9007C1D8E4F03D506A4A011B907A9E8D04E3C605.address 151.80.42.103
-9007C1D8E4F03D506A4A011B907A9E8D04E3C605.or_port 9001
-9007C1D8E4F03D506A4A011B907A9E8D04E3C605.dir_port 9030
-9007C1D8E4F03D506A4A011B907A9E8D04E3C605.orport6_address 2001:41d0:e:f67::114
-9007C1D8E4F03D506A4A011B907A9E8D04E3C605.orport6_port 9001
+AEA43CB1E47BE5F8051711B2BF01683DB1568E05.address 37.187.7.74
+AEA43CB1E47BE5F8051711B2BF01683DB1568E05.or_port 443
+AEA43CB1E47BE5F8051711B2BF01683DB1568E05.dir_port 80
+AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_address 2001:41d0:a:74a::1
+AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_port 443
B143D439B72D239A419F8DCE07B8A8EB1B486FA7.address 212.129.62.232
B143D439B72D239A419F8DCE07B8A8EB1B486FA7.or_port 443
B143D439B72D239A419F8DCE07B8A8EB1B486FA7.dir_port 80
-32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.address 109.105.109.162
-32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.or_port 60784
-32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.dir_port 52860
-32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_address 2001:948:7:2::163
-32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_port 5001
-39F096961ED2576975C866D450373A9913AFDC92.address 198.50.191.95
-39F096961ED2576975C866D450373A9913AFDC92.or_port 443
-39F096961ED2576975C866D450373A9913AFDC92.dir_port 80
-64186650FFE4469EBBE52B644AE543864D32F43C.address 89.187.142.208
-64186650FFE4469EBBE52B644AE543864D32F43C.or_port 443
-64186650FFE4469EBBE52B644AE543864D32F43C.dir_port 80
-D64366987CB39F61AD21DBCF8142FA0577B92811.address 37.221.162.226
-D64366987CB39F61AD21DBCF8142FA0577B92811.or_port 9001
-D64366987CB39F61AD21DBCF8142FA0577B92811.dir_port 9030
+B1726B94885CE3AC3910CA8B60622B97B98E2529.address 185.66.250.141
+B1726B94885CE3AC3910CA8B60622B97B98E2529.or_port 9001
+B1726B94885CE3AC3910CA8B60622B97B98E2529.dir_port 9030
+B83DC1558F0D34353BB992EF93AFEAFDB226A73E.address 193.11.114.46
+B83DC1558F0D34353BB992EF93AFEAFDB226A73E.or_port 9003
+B83DC1558F0D34353BB992EF93AFEAFDB226A73E.dir_port 9032
BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.address 197.231.221.211
BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.or_port 9001
BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.dir_port 9030
-A10C4F666D27364036B562823E5830BC448E046A.address 171.25.193.77
-A10C4F666D27364036B562823E5830BC448E046A.or_port 443
-A10C4F666D27364036B562823E5830BC448E046A.dir_port 80
-A10C4F666D27364036B562823E5830BC448E046A.orport6_address 2001:67c:289c:3::77
-A10C4F666D27364036B562823E5830BC448E046A.orport6_port 443
+BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.address 198.96.155.3
+BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.or_port 5001
+BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.dir_port 8080
+BF0FB582E37F738CD33C3651125F2772705BB8E8.address 148.251.190.229
+BF0FB582E37F738CD33C3651125F2772705BB8E8.or_port 9010
+BF0FB582E37F738CD33C3651125F2772705BB8E8.dir_port 9030
+BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_address 2a01:4f8:211:c68::2
+BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_port 9010
+C414F28FD2BEC1553024299B31D4E726BEB8E788.address 188.138.112.60
+C414F28FD2BEC1553024299B31D4E726BEB8E788.or_port 1521
+C414F28FD2BEC1553024299B31D4E726BEB8E788.dir_port 1433
+C697612CA5AED06B8D829FCC6065B9287212CB2F.address 195.154.79.128
+C697612CA5AED06B8D829FCC6065B9287212CB2F.or_port 443
+C697612CA5AED06B8D829FCC6065B9287212CB2F.dir_port 80
+CBD0D1BD110EC52963082D839AC6A89D0AE243E7.address 37.59.46.159
+CBD0D1BD110EC52963082D839AC6A89D0AE243E7.or_port 9001
+CBD0D1BD110EC52963082D839AC6A89D0AE243E7.dir_port 9030
CBEE0F3303C8C50462A12107CA2AE061831931BC.address 91.121.54.8
CBEE0F3303C8C50462A12107CA2AE061831931BC.or_port 9001
CBEE0F3303C8C50462A12107CA2AE061831931BC.dir_port 9030
@@ -120,196 +237,51 @@ CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.or_port 443
CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.dir_port 80
CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.orport6_address 2a03:b0c0:2:d0::b7:5001
CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.orport6_port 443
-EC413181CEB1C8EDC17608BBB177CD5FD8535E99.address 91.219.236.222
-EC413181CEB1C8EDC17608BBB177CD5FD8535E99.or_port 443
-EC413181CEB1C8EDC17608BBB177CD5FD8535E99.dir_port 80
-49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.address 188.165.194.195
-49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.or_port 9001
-49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF.dir_port 9030
-C697612CA5AED06B8D829FCC6065B9287212CB2F.address 195.154.79.128
-C697612CA5AED06B8D829FCC6065B9287212CB2F.or_port 443
-C697612CA5AED06B8D829FCC6065B9287212CB2F.dir_port 80
-DDD7871C1B7FA32CB55061E08869A236E61BDDF8.address 5.34.183.205
-DDD7871C1B7FA32CB55061E08869A236E61BDDF8.or_port 443
-DDD7871C1B7FA32CB55061E08869A236E61BDDF8.dir_port 80
-CBD0D1BD110EC52963082D839AC6A89D0AE243E7.address 37.59.46.159
-CBD0D1BD110EC52963082D839AC6A89D0AE243E7.or_port 9001
-CBD0D1BD110EC52963082D839AC6A89D0AE243E7.dir_port 9030
-322C6E3A973BC10FC36DE3037AD27BC89F14723B.address 212.83.154.33
-322C6E3A973BC10FC36DE3037AD27BC89F14723B.or_port 8443
-322C6E3A973BC10FC36DE3037AD27BC89F14723B.dir_port 8080
-DD85503F2D1F52EF9EAD621E942298F46CD2FC10.address 178.62.173.203
-DD85503F2D1F52EF9EAD621E942298F46CD2FC10.or_port 9001
-DD85503F2D1F52EF9EAD621E942298F46CD2FC10.dir_port 9030
-DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_address 2a03:b0c0:0:1010::a4:b001
-DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_port 9001
-C414F28FD2BEC1553024299B31D4E726BEB8E788.address 188.138.112.60
-C414F28FD2BEC1553024299B31D4E726BEB8E788.or_port 1521
-C414F28FD2BEC1553024299B31D4E726BEB8E788.dir_port 1433
-FFA72BD683BC2FCF988356E6BEC1E490F313FB07.address 193.11.164.243
-FFA72BD683BC2FCF988356E6BEC1E490F313FB07.or_port 9001
-FFA72BD683BC2FCF988356E6BEC1E490F313FB07.dir_port 9030
-FFA72BD683BC2FCF988356E6BEC1E490F313FB07.orport6_address 2001:6b0:7:125::243
-FFA72BD683BC2FCF988356E6BEC1E490F313FB07.orport6_port 9001
-5665A3904C89E22E971305EE8C1997BCA4123C69.address 94.23.204.175
-5665A3904C89E22E971305EE8C1997BCA4123C69.or_port 9001
-5665A3904C89E22E971305EE8C1997BCA4123C69.dir_port 9030
-E781F4EC69671B3F1864AE2753E0890351506329.address 176.31.180.157
-E781F4EC69671B3F1864AE2753E0890351506329.or_port 22
-E781F4EC69671B3F1864AE2753E0890351506329.dir_port 143
-E781F4EC69671B3F1864AE2753E0890351506329.orport6_address 2001:41d0:8:eb9d::1
-E781F4EC69671B3F1864AE2753E0890351506329.orport6_port 22
-4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.address 108.53.208.157
-4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.or_port 443
-4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.dir_port 80
-0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.address 5.39.92.199
-0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.or_port 443
-0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.dir_port 80
-92ECC9E0E2AF81BB954719B189AC362E254AD4A5.address 91.219.237.244
-92ECC9E0E2AF81BB954719B189AC362E254AD4A5.or_port 443
-92ECC9E0E2AF81BB954719B189AC362E254AD4A5.dir_port 80
+D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.address 134.119.3.164
+D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.or_port 9001
+D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.dir_port 9030
D2A1703758A0FBBA026988B92C2F88BAB59F9361.address 185.13.38.75
D2A1703758A0FBBA026988B92C2F88BAB59F9361.or_port 9001
D2A1703758A0FBBA026988B92C2F88BAB59F9361.dir_port 9030
-0756B7CD4DFC8182BE23143FAC0642F515182CEB.address 5.9.110.236
-0756B7CD4DFC8182BE23143FAC0642F515182CEB.or_port 9001
-0756B7CD4DFC8182BE23143FAC0642F515182CEB.dir_port 9030
-0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_address 2a01:4f8:162:51e2::2
-0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_port 9001
-2541759BEC04D37811C2209A88E863320271EC9C.address 185.61.138.18
-2541759BEC04D37811C2209A88E863320271EC9C.or_port 4443
-2541759BEC04D37811C2209A88E863320271EC9C.dir_port 8080
-9030DCF419F6E2FBF84F63CBACBA0097B06F557E.address 5.79.68.161
-9030DCF419F6E2FBF84F63CBACBA0097B06F557E.or_port 443
-9030DCF419F6E2FBF84F63CBACBA0097B06F557E.dir_port 81
-9030DCF419F6E2FBF84F63CBACBA0097B06F557E.orport6_address 2001:1af8:4700:a012:1::1
-9030DCF419F6E2FBF84F63CBACBA0097B06F557E.orport6_port 443
+D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.address 37.187.115.157
+D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.or_port 9001
+D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.dir_port 9030
+D64366987CB39F61AD21DBCF8142FA0577B92811.address 37.221.162.226
+D64366987CB39F61AD21DBCF8142FA0577B92811.or_port 9001
+D64366987CB39F61AD21DBCF8142FA0577B92811.dir_port 9030
DAA39FC00B196B353C2A271459C305C429AF09E4.address 193.35.52.53
DAA39FC00B196B353C2A271459C305C429AF09E4.or_port 9001
DAA39FC00B196B353C2A271459C305C429AF09E4.dir_port 9030
+DD85503F2D1F52EF9EAD621E942298F46CD2FC10.address 178.62.173.203
+DD85503F2D1F52EF9EAD621E942298F46CD2FC10.or_port 9001
+DD85503F2D1F52EF9EAD621E942298F46CD2FC10.dir_port 9030
+DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_address 2a03:b0c0:0:1010::a4:b001
+DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_port 9001
+DDD7871C1B7FA32CB55061E08869A236E61BDDF8.address 5.34.183.205
+DDD7871C1B7FA32CB55061E08869A236E61BDDF8.or_port 443
+DDD7871C1B7FA32CB55061E08869A236E61BDDF8.dir_port 80
E589316576A399C511A9781A73DA4545640B479D.address 46.252.26.2
E589316576A399C511A9781A73DA4545640B479D.or_port 49991
E589316576A399C511A9781A73DA4545640B479D.dir_port 45212
-A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.address 176.9.5.116
-A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.or_port 9001
-A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911.dir_port 9030
-98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.address 85.214.206.219
-98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.or_port 9001
-98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.dir_port 9030
-9F7D6E6420183C2B76D3CE99624EBC98A21A967E.address 46.28.110.244
-9F7D6E6420183C2B76D3CE99624EBC98A21A967E.or_port 443
-9F7D6E6420183C2B76D3CE99624EBC98A21A967E.dir_port 80
-A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.address 46.165.230.5
-A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.or_port 443
-A0F06C2FADF88D3A39AA3072B406F09D7095AC9E.dir_port 80
-844AE9CAD04325E955E2BE1521563B79FE7094B7.address 192.87.28.82
-844AE9CAD04325E955E2BE1521563B79FE7094B7.or_port 9001
-844AE9CAD04325E955E2BE1521563B79FE7094B7.dir_port 9030
-30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.address 213.61.66.118
-30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.or_port 9001
-30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.dir_port 9031
-2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.address 144.76.26.175
-2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.or_port 9011
-2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.dir_port 9012
-7350AB9ED7568F22745198359373C04AC783C37C.address 176.31.191.26
-7350AB9ED7568F22745198359373C04AC783C37C.or_port 9001
-7350AB9ED7568F22745198359373C04AC783C37C.dir_port 9030
-794D8EA8343A4E820320265D05D4FA83AB6D1778.address 185.11.180.67
-794D8EA8343A4E820320265D05D4FA83AB6D1778.or_port 9001
-794D8EA8343A4E820320265D05D4FA83AB6D1778.dir_port 80
-6A640018EABF3DA9BAD9321AA37C2C87BBE1F907.address 144.76.73.140
-6A640018EABF3DA9BAD9321AA37C2C87BBE1F907.or_port 9001
-6A640018EABF3DA9BAD9321AA37C2C87BBE1F907.dir_port 9030
-0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.address 178.62.197.82
-0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.or_port 443
-0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.dir_port 80
-BF0FB582E37F738CD33C3651125F2772705BB8E8.address 148.251.190.229
-BF0FB582E37F738CD33C3651125F2772705BB8E8.or_port 9010
-BF0FB582E37F738CD33C3651125F2772705BB8E8.dir_port 9030
-BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_address 2a01:4f8:211:c68::2
-BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_port 9010
-6FC6F08270D565BE89B7C819DD8E2D487397C073.address 94.126.23.174
-6FC6F08270D565BE89B7C819DD8E2D487397C073.or_port 9001
-6FC6F08270D565BE89B7C819DD8E2D487397C073.dir_port 9030
-75F1992FD3F403E9C082A5815EB5D12934CDF46C.address 46.101.237.246
-75F1992FD3F403E9C082A5815EB5D12934CDF46C.or_port 9001
-75F1992FD3F403E9C082A5815EB5D12934CDF46C.dir_port 9030
-75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_address 2a03:b0c0:3:d0::208:5001
-75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_port 9050
-8844D87E9B038BE3270938F05AF797E1D3C74C0F.address 93.180.156.84
-8844D87E9B038BE3270938F05AF797E1D3C74C0F.or_port 9001
-8844D87E9B038BE3270938F05AF797E1D3C74C0F.dir_port 9030
-29F1020B94BE25E6BE1AD13E93CE19D2131B487C.address 194.150.168.79
-29F1020B94BE25E6BE1AD13E93CE19D2131B487C.or_port 11111
-29F1020B94BE25E6BE1AD13E93CE19D2131B487C.dir_port 11112
-7A32C9519D80CA458FC8B034A28F5F6815649A98.address 82.223.21.74
-7A32C9519D80CA458FC8B034A28F5F6815649A98.or_port 9001
-7A32C9519D80CA458FC8B034A28F5F6815649A98.dir_port 9030
-7A32C9519D80CA458FC8B034A28F5F6815649A98.orport6_address 2001:470:53e0::cafe
-7A32C9519D80CA458FC8B034A28F5F6815649A98.orport6_port 9050
-0C2C599AFCB26F5CFC2C7592435924C1D63D9484.address 5.196.88.122
-0C2C599AFCB26F5CFC2C7592435924C1D63D9484.or_port 9001
-0C2C599AFCB26F5CFC2C7592435924C1D63D9484.dir_port 9030
+EBE718E1A49EE229071702964F8DB1F318075FF8.address 131.188.40.188
+EBE718E1A49EE229071702964F8DB1F318075FF8.or_port 80
+EBE718E1A49EE229071702964F8DB1F318075FF8.dir_port 443
+EC413181CEB1C8EDC17608BBB177CD5FD8535E99.address 91.219.236.222
+EC413181CEB1C8EDC17608BBB177CD5FD8535E99.or_port 443
+EC413181CEB1C8EDC17608BBB177CD5FD8535E99.dir_port 80
+F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.address 94.242.246.23
+F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.or_port 9001
+F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.dir_port 443
+F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.orport6_address 2a01:608:ffff:ff07::1:23
+F65E0196C94DFFF48AFBF2F5F9E3E19AAE583FD0.orport6_port 9003
F960DF50F0FD4075AC9B505C1D4FFC8384C490FB.address 46.101.143.173
F960DF50F0FD4075AC9B505C1D4FFC8384C490FB.or_port 443
F960DF50F0FD4075AC9B505C1D4FFC8384C490FB.dir_port 80
-17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.address 178.32.216.146
-17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.or_port 9001
-17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2.dir_port 9030
-D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.address 134.119.3.164
-D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.or_port 9001
-D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.dir_port 9030
-3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.address 164.132.77.175
-3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.or_port 9001
-3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B.dir_port 9030
-9231DF741915AA1630031A93026D88726877E93A.address 51.255.41.65
-9231DF741915AA1630031A93026D88726877E93A.or_port 9001
-9231DF741915AA1630031A93026D88726877E93A.dir_port 9030
-2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.address 62.210.124.124
-2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.or_port 9101
-2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.dir_port 9130
-2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_address 2001:bc8:3f23:100::1
-2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_port 9101
-AD253B49E303C6AB1E048B014392AC569E8A7DAE.address 163.172.131.88
-AD253B49E303C6AB1E048B014392AC569E8A7DAE.or_port 443
-AD253B49E303C6AB1E048B014392AC569E8A7DAE.dir_port 80
-AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_address 2001:bc8:4400:2100::2:1009
-AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_port 443
-ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.address 86.59.119.88
-ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.or_port 443
-ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.dir_port 80
-FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64.address 195.154.8.111
-FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64.or_port 443
-FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64.dir_port 80
-20462CBA5DA4C2D963567D17D0B7249718114A68.address 212.47.229.2
-20462CBA5DA4C2D963567D17D0B7249718114A68.or_port 9001
-20462CBA5DA4C2D963567D17D0B7249718114A68.dir_port 9030
-5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.address 5.175.233.86
-5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.or_port 443
-5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.dir_port 80
-B1726B94885CE3AC3910CA8B60622B97B98E2529.address 185.66.250.141
-B1726B94885CE3AC3910CA8B60622B97B98E2529.or_port 9001
-B1726B94885CE3AC3910CA8B60622B97B98E2529.dir_port 9030
-B83DC1558F0D34353BB992EF93AFEAFDB226A73E.address 193.11.114.46
-B83DC1558F0D34353BB992EF93AFEAFDB226A73E.or_port 9003
-B83DC1558F0D34353BB992EF93AFEAFDB226A73E.dir_port 9032
-1DBAED235E3957DE1ABD25B4206BE71406FB61F8.address 46.101.151.222
-1DBAED235E3957DE1ABD25B4206BE71406FB61F8.or_port 443
-1DBAED235E3957DE1ABD25B4206BE71406FB61F8.dir_port 80
-5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.address 78.142.142.246
-5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.or_port 443
-5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.dir_port 80
-ABCB4965F1FEE193602B50A365425105C889D3F8.address 192.34.63.137
-ABCB4965F1FEE193602B50A365425105C889D3F8.or_port 443
-ABCB4965F1FEE193602B50A365425105C889D3F8.dir_port 9030
-5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.address 178.16.208.62
-5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.or_port 443
-5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.dir_port 80
-5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.orport6_address 2a00:1c20:4089:1234:a6a4:2926:d0af:dfee
-5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B.orport6_port 443
-1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.address 91.219.237.229
-1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.or_port 443
-1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.dir_port 80
-361D33C96D0F161275EE67E2C91EE10B276E778B.address 217.79.190.25
-361D33C96D0F161275EE67E2C91EE10B276E778B.or_port 9090
-361D33C96D0F161275EE67E2C91EE10B276E778B.dir_port 9030
+FD1871854BFC06D7B02F10742073069F0528B5CC.address 192.187.124.98
+FD1871854BFC06D7B02F10742073069F0528B5CC.or_port 9001
+FD1871854BFC06D7B02F10742073069F0528B5CC.dir_port 9030
+FFA72BD683BC2FCF988356E6BEC1E490F313FB07.address 193.11.164.243
+FFA72BD683BC2FCF988356E6BEC1E490F313FB07.or_port 9001
+FFA72BD683BC2FCF988356E6BEC1E490F313FB07.dir_port 9030
+FFA72BD683BC2FCF988356E6BEC1E490F313FB07.orport6_address 2001:6b0:7:125::243
+FFA72BD683BC2FCF988356E6BEC1E490F313FB07.orport6_port 9001
diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py
index 95fd6a7..1b818b6 100644
--- a/test/unit/descriptor/remote.py
+++ b/test/unit/descriptor/remote.py
@@ -175,7 +175,7 @@ class TestDescriptorDownloader(unittest.TestCase):
# quick sanity test that we can load cached content
fallback_directories = stem.descriptor.remote.FallbackDirectory.from_cache()
self.assertTrue(len(fallback_directories) > 10)
- self.assertEqual('5.175.233.86', fallback_directories['5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33'].address)
+ self.assertEqual('5.39.92.199', fallback_directories['0BEA4A88D069753218EAAAD6D22EA87B9A1319D6'].address)
@patch(URL_OPEN)
def test_fallback_directories_from_remote(self, urlopen_mock):
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits