tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[tor/master] Add a timestamp to the header of the current fallback list
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit ca1f808d938939b1bfb5ffed5124d3a32c7d1743 Author: teor <teor2345(a)gmail.com> Date: Wed Dec 27 21:13:21 2017 +1100 Add a timestamp to the header of the current fallback list This timestamp is based on the time that list was first committed. Part of 24725. --- src/or/fallback_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 912a8853c..2c8fe724a 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -1,5 +1,6 @@ /* type=fallback */ /* version=2.0.0 */ +/* timestamp=20170526090242 */ /* ===== */ /* Whitelist & blacklist excluded 1326 of 1513 candidates. */ /* Checked IPv4 DirPorts served a consensus within 15.0s. */

1 0

[tor/master] Adjust fallback selection parameters
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit d30d3fe8ed4b88c070736b22e2de16dcfe9a1b80 Author: teor <teor2345(a)gmail.com> Date: Fri Jan 5 00:08:11 2018 +1100 Adjust fallback selection parameters Avoid selecting fallbacks that change their IP addresses too often. Select more fallbacks by ignoring the Guard flag, and allowing lower cutoffs for the Running and V2Dir flags. Also allow a lower bandwidth, and a higher number of fallbacks per operator (5% of the list). Implements ticket 24785. --- changes/ticket24785 | 6 +++++ scripts/maint/updateFallbackDirs.py | 49 +++++++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/changes/ticket24785 b/changes/ticket24785 new file mode 100644 index 000000000..39667cb8d --- /dev/null +++ b/changes/ticket24785 @@ -0,0 +1,6 @@ + o Minor features (fallbacks): + - Avoid selecting fallbacks that change their IP addresses too often. + Select more fallbacks by ignoring the Guard flag, and allowing lower + cutoffs for the Running and V2Dir flags. Also allow a lower bandwidth, + and a higher number of fallbacks per operator (5% of the list). + Implements ticket 24785. diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index fafc4f129..9f44bc097 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -170,25 +170,30 @@ MAX_LIST_FILE_SIZE = 1024 * 1024 # Require fallbacks to have the same address and port for a set amount of time # We used to have this at 1 week, but that caused many fallback failures, which -# meant that we had to rebuild the list more often. +# meant that we had to rebuild the list more often. We want fallbacks to be +# stable for 2 years, so we set it to a few months. # # There was a bug in Tor 0.2.8.1-alpha and earlier where a relay temporarily # submits a 0 DirPort when restarted. # This causes OnionOO to (correctly) reset its stability timer. -# Affected relays should upgrade to Tor 0.2.8.7 or later, which has a fix +# Affected relays should upgrade to Tor 0.2.9 or later, which has a fix # for this issue. -ADDRESS_AND_PORT_STABLE_DAYS = 30 +# +# If a relay changes address or port, that's it, it's not useful any more, +# because clients can't find it +ADDRESS_AND_PORT_STABLE_DAYS = 90 # We ignore relays that have been down for more than this period MAX_DOWNTIME_DAYS = 0 if MUST_BE_RUNNING_NOW else 7 -# What time-weighted-fraction of these flags must FallbackDirs -# Equal or Exceed? -CUTOFF_RUNNING = .90 -CUTOFF_V2DIR = .90 -# Tolerate lower guard flag averages, as guard flags are removed for some time -# after a relay restarts -CUTOFF_GUARD = .80 -# What time-weighted-fraction of these flags must FallbackDirs -# Equal or Fall Under? +# FallbackDirs must have a time-weighted-fraction that is greater than or +# equal to: +# Mirrors that are down half the time are still useful half the time +CUTOFF_RUNNING = .50 +CUTOFF_V2DIR = .50 +# Guard flags are removed for some time after a relay restarts, so we ignore +# the guard flag. +CUTOFF_GUARD = .00 +# FallbackDirs must have a time-weighted-fraction that is less than or equal +# to: # .00 means no bad exits PERMITTED_BADEXIT = .00 @@ -211,13 +216,19 @@ MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 200 MIN_FALLBACK_COUNT = 0 if OUTPUT_CANDIDATES else MAX_FALLBACK_COUNT*0.5 # The maximum number of fallbacks on the same address, contact, or family -# With 200 fallbacks, this means each operator can see 1% of client bootstraps -# (The directory authorities used to see ~12% of client bootstraps each.) +# +# With 150 fallbacks, this means each operator sees 5% of client bootstraps. +# For comparison: +# - We try to limit guard and exit operators to 5% of the network +# - The directory authorities used to see 11% of client bootstraps each +# +# We also don't want too much of the list to go down if a single operator +# has to move all their relays. MAX_FALLBACKS_PER_IP = 1 MAX_FALLBACKS_PER_IPV4 = MAX_FALLBACKS_PER_IP MAX_FALLBACKS_PER_IPV6 = MAX_FALLBACKS_PER_IP -MAX_FALLBACKS_PER_CONTACT = 3 -MAX_FALLBACKS_PER_FAMILY = 3 +MAX_FALLBACKS_PER_CONTACT = 7 +MAX_FALLBACKS_PER_FAMILY = 7 ## Fallback Bandwidth Requirements @@ -229,11 +240,11 @@ EXIT_BANDWIDTH_FRACTION = 1.0 # If a single fallback's bandwidth is too low, it's pointless adding it # We expect fallbacks to handle an extra 10 kilobytes per second of traffic -# Make sure they can support a hundred times the expected extra load -# (Use 102.4 to make it come out nicely in MByte/s) +# Make sure they can support fifty times the expected extra load +# # We convert this to a consensus weight before applying the filter, # because all the bandwidth amounts are specified by the relay -MIN_BANDWIDTH = 102.4 * 10.0 * 1024.0 +MIN_BANDWIDTH = 50.0 * 10.0 * 1024.0 # Clients will time out after 30 seconds trying to download a consensus # So allow fallback directories half that to deliver a consensus

1 0

[tor/master] Add fallback directory mirror helper scripts
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit e244738bbd7d0fb58bb17bcec071a0b7b71fd532 Author: teor <teor2345(a)gmail.com> Date: Fri Dec 22 21:38:12 2017 +1100 Add fallback directory mirror helper scripts Add the generateFallbackDirLine.py script for automatically generating fallback directory mirror lines from relay fingerprints. No more typos! Add the lookupFallbackDirContact.py script for automatically looking up operator contact info from relay fingerprints. Implements ticket 24706. --- changes/ticket24706 | 6 +++++ scripts/maint/fallback.blacklist | 2 ++ scripts/maint/fallback.whitelist | 2 ++ scripts/maint/generateFallbackDirLine.py | 41 +++++++++++++++++++++++++++++++ scripts/maint/lookupFallbackDirContact.py | 28 +++++++++++++++++++++ 5 files changed, 79 insertions(+) diff --git a/changes/ticket24706 b/changes/ticket24706 new file mode 100644 index 000000000..716f88c89 --- /dev/null +++ b/changes/ticket24706 @@ -0,0 +1,6 @@ + o Minor features (fallback directory mirrors): + - Add the generateFallbackDirLine.py script for automatically generating + fallback directory mirror lines from relay fingerprints. No more typos! + Add the lookupFallbackDirContact.py script for automatically looking up + operator contact info from relay fingerprints. + Implements ticket 24706. diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index 1d0edfd0b..a118cb591 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -3,6 +3,8 @@ # Format: # [ IPv4[:DirPort] ] [ orport=<ORPort> ] [ id=<ID> ] ... # [ ipv6=<IPv6>[:<IPv6 ORPort>] ] +# or use: +# scripts/maint/generateFallbackDirLine.py fingerprint ... # # If a sufficiently specific group of attributes matches, the directory mirror # will be excluded: (each group is listed on its own line) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index b8bb82fd0..e9158e128 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -2,6 +2,8 @@ # # Format: # IPv4:DirPort orport=<ORPort> id=<ID> [ ipv6=<IPv6>:<IPv6 ORPort> ] +# or use: +# scripts/maint/generateFallbackDirLine.py fingerprint ... # # All attributes must match for the directory mirror to be included. # If the fallback has an ipv6 key, the whitelist line must also have diff --git a/scripts/maint/generateFallbackDirLine.py b/scripts/maint/generateFallbackDirLine.py new file mode 100755 index 000000000..b59edc33f --- /dev/null +++ b/scripts/maint/generateFallbackDirLine.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python + +# Generate a fallback directory whitelist/blacklist line for every fingerprint +# passed as an argument. +# +# Usage: +# generateFallbackDirLine.py fingerprint ... + +import sys + +import stem.descriptor.remote as remote + +if len(sys.argv) <= 1: + print "Usage: {} fingerprint ...".format(sys.argv[0]) + sys.exit(-1) + +# we need the full consensus, because it has IPv6 ORPorts +# and we want a fingerprint to router mapping in routers +# +# stem returns document_handler='DOCUMENT' as a list of consensuses +# with one entry +consensus = remote.get_consensus(document_handler='DOCUMENT').run()[0] + +for fingerprint in sys.argv[1:]: + if fingerprint in consensus.routers: + r = consensus.routers[fingerprint] + # Tor clients don't use DirPorts, but old code requires one for fallbacks + if r.dir_port is not None: + # IPv4:DirPort orport=ORPort id=Fingerprint ipv6=[IPv6]:IPv6ORPort # nick + ipv6_or_ap_list = [ apv for apv in r.or_addresses if apv[2] ] + ipv6_str = "" + if len(ipv6_or_ap_list) > 0: + ipv6_or_ap = ipv6_or_ap_list[0] + ipv6_str = " ipv6=[{}]:{}".format(ipv6_or_ap[0], ipv6_or_ap[1]) + print ("{}:{} orport={} id={}{} # {}" + .format(r.address, r.dir_port, r.or_port, r.fingerprint, + ipv6_str, r.nickname)) + else: + print "# {} needs a DirPort".format(fingerprint) + else: + print "# {} not found in current consensus".format(fingerprint) diff --git a/scripts/maint/lookupFallbackDirContact.py b/scripts/maint/lookupFallbackDirContact.py new file mode 100755 index 000000000..14c53d128 --- /dev/null +++ b/scripts/maint/lookupFallbackDirContact.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python + +# Lookup fallback directory contact lines for every fingerprint passed as an +# argument. +# +# Usage: +# lookupFallbackDirContact.py fingerprint ... + +import sys + +import stem.descriptor.remote as remote + +if len(sys.argv) <= 1: + print "Usage: {} fingerprint ...".format(sys.argv[0]) + sys.exit(-1) + +# we need descriptors, because the consensus does not have contact infos +descriptor_list = remote.get_server_descriptors(fingerprints=sys.argv[1:]).run() + +descriptor_list_fingerprints = [] +for d in descriptor_list: + assert d.fingerprint in sys.argv[1:] + descriptor_list_fingerprints.append(d.fingerprint) + print "{} {}".format(d.fingerprint, d.contact) + +for fingerprint in sys.argv[1:]: + if fingerprint not in descriptor_list_fingerprints: + print "{} not found in current descriptors".format(fingerprint)

1 0

[tor/master] Add delimiters at the end of every fallback entry in the current list
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit c8c0e9167d32994aef073a403f3812e7629a08ec Author: teor <teor2345(a)gmail.com> Date: Sun Dec 24 12:54:13 2017 +1100 Add delimiters at the end of every fallback entry in the current list Using this script: sed -i.bak $'s|^,$|/* ===== */\\\n,|' src/or/fallback_dirs.inc (Due to embedded newlines, this script only works in bash.) And manually add a delimiter to the end of the header, and the start of the fallback list. This allows us to check that the code compiles, and the unit tests pass. And it allows downstream users stem and atlas to adapt to the new format. The upcoming fallback rebuild will automatically generate this new format. Follow-up to 24725. --- src/or/fallback_dirs.inc | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 170f1a01a..dfac15e1e 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -1,5 +1,6 @@ /* type=fallback */ /* version=2.0.0 */ +/* ===== */ /* Whitelist & blacklist excluded 1326 of 1513 candidates. */ /* To comment-out entries in this file, use C comments, and add * to the start of each line. (stem finds fallback entries using " at the start of a line.) */ /* Checked IPv4 DirPorts served a consensus within 15.0s. */ @@ -16,659 +17,811 @@ URL: https:onionoo.torproject.orgdetails?fields=fingerprint%2Cnickname%2Ccontact Onionoo Source: uptime Date: 2017-05-16 07:00:00 Version: 4.0 URL: https:onionoo.torproject.orguptime?first_seen_days=30-&flag=V2Dir&type=relay&last_seen_days=-0 */ +/* ===== */ "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB" " ipv6=[2a01:4f8:162:51e2::2]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6" " ipv6=[2001:41d0:8:b1c7::1]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89" " ipv6=[2001:6b0:30:1000::99]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B" " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" " ipv6=[2a01:4f8:190:9490::dead]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA" " ipv6=[2a01:4f8:190:514a::2]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68" " ipv6=[2001:bc8:4400:2100::f03]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996" " ipv6=[2a00:1158:3::11a]:993" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "109.105.109.162:52860 orport=60784 id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F" " ipv6=[2001:948:7:2::163]:5001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB" " ipv6=[2001:bc8:38cb:201::8]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.187.22.87:9030 orport=9001 id=36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400" " ipv6=[2001:41d0:a:1657::1]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "62.210.92.11:9130 orport=9101 id=387B065A38E4DAA16D9D41C2964ECBC4B31D30FF" " ipv6=[2001:bc8:338c::1]:9101" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "164.132.77.175:9030 orport=9001 id=3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.47.230.49:9030 orport=9001 id=3D6D0771E54056AEFC28BB1DE816951F11826E97" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "176.10.107.180:9030 orport=9001 id=3D7E274A87D9A89AF064C13D1EE4CA1F184F2600" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "217.79.179.177:9030 orport=9001 id=3E53D3979DB07EFD736661C934A1DED14127B684" " ipv6=[2001:4ba0:fff9:131:6c4f::90d3]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.86.96:9030 orport=9001 id=439D0447772CB107B886F7782DBC201FA26B92D1" " ipv6=[2a03:b0c0:1:d0::3cf:7001]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.157.213:8080 orport=443 id=4623A9EC53BFD83155929E56D6F7B55B5E718C24" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "31.31.78.49:80 orport=443 id=46791D156C9B6C255C2665D4D8393EC7DBAA7798" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "69.162.139.9:9030 orport=9001 id=4791FC0692EAB60DF2BCCAFF940B95B74E7654F6" " ipv6=[2607:f128:40:1212::45a2:8b09]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "51.254.246.203:9030 orport=9001 id=47B596B81C9E6277B98623A84B7629798A16E8D5" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.187.102.186:9030 orport=9001 id=489D94333DF66D57FFE34D9D59CC2D97E2CB0053" " ipv6=[2001:41d0:a:26ba::1]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "188.165.194.195:9030 orport=9001 id=49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "62.102.148.67:80 orport=443 id=4A0C3E177AF684581EF780981AEAF51A98A6B5CF" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "51.254.101.242:9002 orport=9001 id=4CC9CC9195EC38645B699A33307058624F660CCF" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "81.7.16.182:80 orport=443 id=51E1CF613FD6F9F11FE24743C91D6F9981807D82" " ipv6=[2a02:180:1:1::517:10b6]:993" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "95.130.12.119:80 orport=443 id=587E0A9552E4274B251F29B5B2673D38442EE4BF" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.21.100.50:9030 orport=9001 id=58ED9C9C35E433EE58764D62892B4FFD518A3CD0" " ipv6=[2a00:1158:2:cd00:0:74:6f:72]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "120.29.217.46:80 orport=443 id=5E853C94AB1F655E9C908924370A0A6707508C62" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "109.163.234.5:80 orport=443 id=5EB8D862E70981B8690DEDEF546789E26AB2BD24" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "95.128.43.164:80 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90" " ipv6=[2a02:ec0:209:10::4]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.139.104:8080 orport=443 id=68F175CCABE727AA2D2309BCD8789499CEE36ED7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "85.214.62.48:80 orport=443 id=6A7551EEE18F78A9813096E82BF84F740D32B911" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "80.127.137.19:80 orport=443 id=6EF897645B79B6CB35E853B32506375014DE3621" " ipv6=[2001:981:47c1:1::6]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "95.183.48.12:80 orport=443 id=7187CED1A3871F837D0E60AC98F374AC541CB0DA" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "85.214.151.72:9030 orport=9001 id=722D365140C8C52DBB3C9FF6986E3CEFFE2BA812" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "85.235.250.88:80 orport=443 id=72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "176.31.191.26:80 orport=443 id=7350AB9ED7568F22745198359373C04AC783C37C" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "134.119.36.135:80 orport=443 id=763C9556602BD6207771A7A3D958091D44C43228" " ipv6=[2a00:1158:3::2a8]:993" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "188.166.133.133:9030 orport=9001 id=774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7" " ipv6=[2a03:b0c0:2:d0::5:f001]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "81.30.158.213:9030 orport=9001 id=789EA6C9AE9ADDD8760903171CFA9AC5741B0C70" " ipv6=[2001:4ba0:cafe:e84::1]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "171.25.193.131:80 orport=443 id=79861CF8522FC637EF046F7688F5289E49D94576" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "82.223.21.74:9030 orport=9001 id=7A32C9519D80CA458FC8B034A28F5F6815649A98" " ipv6=[2001:470:53e0::cafe]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "51.254.136.195:80 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.11.114.45:9031 orport=9002 id=80AAF8D5956A43C197104CEF2550CD42D165C6FB" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F" " ipv6=[2605:e200:d00c:c01d::1111]:9002" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "188.166.23.127:80 orport=443 id=8672E8A01B4D3FA4C0BBE21C740D4506302EA487" " ipv6=[2a03:b0c0:2:d0::27b:7001]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.194.53:9030 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451" " ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.254.44.135:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605" " ipv6=[2001:41d0:e:f67::114]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "173.255.245.116:9030 orport=9001 id=91E4015E1F82DAF0121D62267E54A1F661AB6DC7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "51.255.41.65:9030 orport=9001 id=9231DF741915AA1630031A93026D88726877E93A" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.16.208.57:80 orport=443 id=92CFD9565B24646CAC2D172D3DB503D69E777B8A" " ipv6=[2a00:1c20:4089:1234:7825:2c5d:1ecd:c66f]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "91.219.237.244:80 orport=443 id=92ECC9E0E2AF81BB954719B189AC362E254AD4A5" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "204.8.156.142:80 orport=443 id=94C4B7B8C50C86A92B6A20107539EE2678CF9A28" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.223.200:80 orport=443 id=998BF3ED7F70E33D1C307247B9626D9E7573C438" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "81.7.10.93:31336 orport=31337 id=99E246DB480B313A3012BC3363093CC26CD209C7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "91.229.20.27:9030 orport=9001 id=9A0D54D3A6D2E0767596BF1515E6162A75B3293F" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "66.111.2.20:9030 orport=9001 id=9A68B85A02318F4E7E87F2828039FBD5D75B0142" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.100.86.128:9030 orport=9001 id=9B31F1F1C1554F9FFB3455911F82E818EF7C7883" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.9.151.241:9030 orport=4223 id=9BF04559224F0F1C3C953D641F1744AF0192543A" " ipv6=[2a01:4f8:190:34f0::2]:4223" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "86.105.212.130:9030 orport=443 id=9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.254.20.134:80 orport=443 id=9F5068310818ED7C70B0BC4087AB55CB12CB4377" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.28.110.244:80 orport=443 id=9F7D6E6420183C2B76D3CE99624EBC98A21A967E" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334" " ipv6=[2001:41d0:1:8989::1]:4052" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.22.36:80 orport=443 id=A0766C0D3A667A3232C7D569DE94A28F9922FCB1" " ipv6=[2a03:b0c0:1:d0::174:1]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" " ipv6=[2001:67c:289c:3::77]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE" " ipv6=[2001:67c:289c:3::78]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.149.122:80 orport=443 id=A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "109.163.234.9:80 orport=443 id=ABF7FBF389C9A747938B639B20E80620B460B2A9" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "86.59.119.88:80 orport=443 id=ACD889D86E02EDDAB1AFD81F598C0936238DC6D0" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.129.62.62:9030 orport=9001 id=ACDD9E85A05B127BA010466C13C8C47212E8A38F" " ipv6=[2a06:d380:0:3700::62]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "163.172.131.88:80 orport=443 id=AD253B49E303C6AB1E048B014392AC569E8A7DAE" " ipv6=[2001:bc8:4400:2100::2:1009]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.187.7.74:80 orport=443 id=AEA43CB1E47BE5F8051711B2BF01683DB1568E05" " ipv6=[2001:41d0:a:74a::1]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.28.205.170:80 orport=443 id=AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.129.62.232:80 orport=443 id=B143D439B72D239A419F8DCE07B8A8EB1B486FA7" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "198.199.64.217:80 orport=443 id=B1D81825CFD7209BD1B4520B040EF5653C204A23" " ipv6=[2604:a880:400:d0::1a9:b001]:9050" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.16.208.60:80 orport=443 id=B44FBE5366AD98B46D829754FA4AC599BAE41A6A" " ipv6=[2a00:1c20:4089:1234:67bc:79f3:61c0:6e49]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "93.115.97.242:9030 orport=9001 id=B5212DB685A2A0FCFBAE425738E478D12361710D" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "81.2.209.10:443 orport=80 id=B6904ADD4C0D10CDA7179E051962350A69A63243" " ipv6=[2001:15e8:201:1::d10a]:80" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "85.248.227.164:444 orport=9002 id=B84F248233FEA90CAD439F292556A3139F6E1B82" " ipv6=[2a00:1298:8011:212::164]:9004" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "89.163.247.43:9030 orport=9001 id=BC7ACFAC04854C77167C7D66B7E471314ED8C410" " ipv6=[2001:4ba0:fff7:25::5]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "198.96.155.3:8080 orport=5001 id=BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "128.199.55.207:9030 orport=9001 id=BCEF908195805E03E92CCFE669C48738E556B9C5" " ipv6=[2a03:b0c0:2:d0::158:3001]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.35.202.221:9030 orport=9001 id=C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08" " ipv6=[2a02:ed06::221]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "213.239.217.18:1338 orport=1337 id=C37BC191AC389179674578C3E6944E925FE186C2" " ipv6=[2a01:4f8:a0:746a:101:1:1:1]:1337" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "188.138.112.60:1433 orport=1521 id=C414F28FD2BEC1553024299B31D4E726BEB8E788" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "85.248.227.163:443 orport=9001 id=C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9" " ipv6=[2a00:1298:8011:212::163]:9003" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.199.226:80 orport=443 id=CBEFF7BA4A4062045133C053F2D70524D8BBE5BE" " ipv6=[2a03:b0c0:2:d0::b7:5001]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "134.119.3.164:9030 orport=9001 id=D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "31.171.155.108:9030 orport=9001 id=D3E5EDDBE5159388704D6785BE51930AAFACEC6F" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "166.82.21.200:9030 orport=9029 id=D5C33F3E203728EDF8361EA868B2939CCC43FAFB" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.14.185.240:9030 orport=443 id=D62FB817B0288085FAC38A6DC8B36DCD85B70260" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.101.169.151:9030 orport=9001 id=D760C5B436E42F93D77EF2D969157EEA14F9B39C" " ipv6=[2a03:b0c0:3:d0::74f:a001]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.4.111.124:9030 orport=9001 id=D9065F9E57899B3D272AA212317AF61A9B14D204" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.35.52.53:9030 orport=9001 id=DAA39FC00B196B353C2A271459C305C429AF09E4" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB" " ipv6=[2001:41d0:2:a683::251]:443" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.62.173.203:9030 orport=9001 id=DD85503F2D1F52EF9EAD621E942298F46CD2FC10" " ipv6=[2a03:b0c0:0:1010::a4:b001]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "78.24.75.53:9030 orport=9001 id=DEB73705B2929AE9BE87091607388939332EF123" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "92.222.38.67:80 orport=443 id=DED6892FF89DBD737BA689698A171B2392EB3E82" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "166.70.207.2:9030 orport=9001 id=E3DB2E354B883B59E8DC56B3E7A353DDFD457812" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "167.114.35.28:9030 orport=9001 id=E65D300F11E1DB12C534B0146BDAB6972F1A8A48" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.87.28.28:9030 orport=9001 id=ED2338CAC2711B3E331392E1ED2831219B794024" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.99.212.139:80 orport=443 id=F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "212.238.208.48:9030 orport=9001 id=F406219CDD339026D160E53FCA0EF6857C70F109" " ipv6=[2001:984:a8fb:1:ba27:ebff:feac:c109]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "46.28.207.141:80 orport=443 id=F69BED36177ED727706512BA6A97755025EEA0FB" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "178.254.13.126:80 orport=443 id=F9246DEF2B653807236DA134F2AEAB103D58ABFE" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "185.96.180.29:80 orport=443 id=F93D8F37E35C390BCAD9F9069E13085B745EC216" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "86.59.119.83:80 orport=443 id=FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "149.56.45.200:9030 orport=9001 id=FE296180018833AF03A8EACD5894A614623D3F76" /* nickname= */ /* extrainfo=0 */ +/* ===== */ , "193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07" " ipv6=[2001:6b0:7:125::243]:9001" /* nickname= */ /* extrainfo=0 */ +/* ===== */ ,

1 0

[tor/master] Add a generated timestamp to the fallback directory header
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 9864fcd4e30e9afa2fa7a8bc25cf8399432a5796 Author: teor <teor2345(a)gmail.com> Date: Wed Dec 27 21:10:46 2017 +1100 Add a generated timestamp to the fallback directory header This can act as a revision counter, as requested by atagar in 24742. Part of 24725. --- scripts/maint/updateFallbackDirs.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 54b50c377..4c0a30a5e 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -2217,6 +2217,10 @@ def list_fallbacks(whitelist, blacklist): print "/* type=fallback */" print ("/* version={} */" .format(cleanse_c_multiline_comment(FALLBACK_FORMAT_VERSION))) + now = datetime.datetime.utcnow() + timestamp = now.strftime('%Y%m%d%H%M%S') + print ("/* timestamp={} */" + .format(cleanse_c_multiline_comment(timestamp))) # end the header with a separator, to make it easier for parsers print SECTION_SEPARATOR_COMMENT

1 0

[tor/master] Add a changes file for 22321, that mentions all its children and 24678
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit e3a2324083e370069a0caea1d07f7c58dc11c7af Author: teor <teor2345(a)gmail.com> Date: Fri Dec 29 20:22:46 2017 +1100 Add a changes file for 22321, that mentions all its children and 24678 --- changes/ticket22321 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket22321 b/changes/ticket22321 new file mode 100644 index 000000000..fcac1bccc --- /dev/null +++ b/changes/ticket22321 @@ -0,0 +1,3 @@ + o Minor features (fallbacks): + - Update the fallback whitelist and blacklist based on opt-ins and relay + changes. Closes tickets 22321, 24678, 22527, 24135, and 24695.

1 0

[tor/master] Add all-zero extrainfo cache flags to the current fallback file
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit c1be0cfdb45d702afa3c1883a5e436cef8115fcd Author: teor <teor2345(a)gmail.com> Date: Sat Dec 23 01:24:48 2017 +1100 Add all-zero extrainfo cache flags to the current fallback file Using this script: sed -i.bak $'s|^,$|/* extrainfo=0 */\\\n,|' src/or/fallback_dirs.inc (Due to embedded newlines, this script only works in bash.) This allows us to check that the code compiles, and the unit tests pass. And it allows downstream users stem and atlas to adapt to the new format. The upcoming fallback rebuild will automatically generate this new format, with actual relay extrainfo cache flags. Follow-up to 22759. --- src/or/fallback_dirs.inc | 151 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 5624ad49f..b7a2a099f 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -18,506 +18,657 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=30-&flag=V2Dir&type=rela */ "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80" /* nickname= */ +/* extrainfo=0 */ , "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524" /* nickname= */ +/* extrainfo=0 */ , "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E" /* nickname= */ +/* extrainfo=0 */ , "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088" /* nickname= */ +/* extrainfo=0 */ , "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB" " ipv6=[2a01:4f8:162:51e2::2]:9001" /* nickname= */ +/* extrainfo=0 */ , "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281" /* nickname= */ +/* extrainfo=0 */ , "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F" /* nickname= */ +/* extrainfo=0 */ , "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6" " ipv6=[2001:41d0:8:b1c7::1]:443" /* nickname= */ +/* extrainfo=0 */ , "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163" /* nickname= */ +/* extrainfo=0 */ , "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0" /* nickname= */ +/* extrainfo=0 */ , "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423" /* nickname= */ +/* extrainfo=0 */ , "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89" " ipv6=[2001:6b0:30:1000::99]:9050" /* nickname= */ +/* extrainfo=0 */ , "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2" /* nickname= */ +/* extrainfo=0 */ , "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B" " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443" /* nickname= */ +/* extrainfo=0 */ , "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" " ipv6=[2a01:4f8:190:9490::dead]:443" /* nickname= */ +/* extrainfo=0 */ , "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794" /* nickname= */ +/* extrainfo=0 */ , "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70" /* nickname= */ +/* extrainfo=0 */ , "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA" " ipv6=[2a01:4f8:190:514a::2]:443" /* nickname= */ +/* extrainfo=0 */ , "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8" /* nickname= */ +/* extrainfo=0 */ , "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7" /* nickname= */ +/* extrainfo=0 */ , "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68" " ipv6=[2001:bc8:4400:2100::f03]:9001" /* nickname= */ +/* extrainfo=0 */ , "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC" /* nickname= */ +/* extrainfo=0 */ , "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207" /* nickname= */ +/* extrainfo=0 */ , "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996" " ipv6=[2a00:1158:3::11a]:993" /* nickname= */ +/* extrainfo=0 */ , "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB" /* nickname= */ +/* extrainfo=0 */ , "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" /* nickname= */ +/* extrainfo=0 */ , "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94" /* nickname= */ +/* extrainfo=0 */ , "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA" /* nickname= */ +/* extrainfo=0 */ , "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2" /* nickname= */ +/* extrainfo=0 */ , "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B" /* nickname= */ +/* extrainfo=0 */ , "109.105.109.162:52860 orport=60784 id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F" " ipv6=[2001:948:7:2::163]:5001" /* nickname= */ +/* extrainfo=0 */ , "163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB" " ipv6=[2001:bc8:38cb:201::8]:9001" /* nickname= */ +/* extrainfo=0 */ , "217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B" /* nickname= */ +/* extrainfo=0 */ , "37.187.22.87:9030 orport=9001 id=36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400" " ipv6=[2001:41d0:a:1657::1]:9001" /* nickname= */ +/* extrainfo=0 */ , "62.210.92.11:9130 orport=9101 id=387B065A38E4DAA16D9D41C2964ECBC4B31D30FF" " ipv6=[2001:bc8:338c::1]:9101" /* nickname= */ +/* extrainfo=0 */ , "198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92" /* nickname= */ +/* extrainfo=0 */ , "164.132.77.175:9030 orport=9001 id=3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B" /* nickname= */ +/* extrainfo=0 */ , "212.47.230.49:9030 orport=9001 id=3D6D0771E54056AEFC28BB1DE816951F11826E97" /* nickname= */ +/* extrainfo=0 */ , "176.10.107.180:9030 orport=9001 id=3D7E274A87D9A89AF064C13D1EE4CA1F184F2600" /* nickname= */ +/* extrainfo=0 */ , "217.79.179.177:9030 orport=9001 id=3E53D3979DB07EFD736661C934A1DED14127B684" " ipv6=[2001:4ba0:fff9:131:6c4f::90d3]:9001" /* nickname= */ +/* extrainfo=0 */ , "178.62.86.96:9030 orport=9001 id=439D0447772CB107B886F7782DBC201FA26B92D1" " ipv6=[2a03:b0c0:1:d0::3cf:7001]:9050" /* nickname= */ +/* extrainfo=0 */ , "163.172.157.213:8080 orport=443 id=4623A9EC53BFD83155929E56D6F7B55B5E718C24" /* nickname= */ +/* extrainfo=0 */ , "31.31.78.49:80 orport=443 id=46791D156C9B6C255C2665D4D8393EC7DBAA7798" /* nickname= */ +/* extrainfo=0 */ , "69.162.139.9:9030 orport=9001 id=4791FC0692EAB60DF2BCCAFF940B95B74E7654F6" " ipv6=[2607:f128:40:1212::45a2:8b09]:9001" /* nickname= */ +/* extrainfo=0 */ , "51.254.246.203:9030 orport=9001 id=47B596B81C9E6277B98623A84B7629798A16E8D5" /* nickname= */ +/* extrainfo=0 */ , "37.187.102.186:9030 orport=9001 id=489D94333DF66D57FFE34D9D59CC2D97E2CB0053" " ipv6=[2001:41d0:a:26ba::1]:9001" /* nickname= */ +/* extrainfo=0 */ , "188.165.194.195:9030 orport=9001 id=49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF" /* nickname= */ +/* extrainfo=0 */ , "62.102.148.67:80 orport=443 id=4A0C3E177AF684581EF780981AEAF51A98A6B5CF" /* nickname= */ +/* extrainfo=0 */ , "51.254.101.242:9002 orport=9001 id=4CC9CC9195EC38645B699A33307058624F660CCF" /* nickname= */ +/* extrainfo=0 */ , "81.7.16.182:80 orport=443 id=51E1CF613FD6F9F11FE24743C91D6F9981807D82" " ipv6=[2a02:180:1:1::517:10b6]:993" /* nickname= */ +/* extrainfo=0 */ , "94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69" /* nickname= */ +/* extrainfo=0 */ , "95.130.12.119:80 orport=443 id=587E0A9552E4274B251F29B5B2673D38442EE4BF" /* nickname= */ +/* extrainfo=0 */ , "185.21.100.50:9030 orport=9001 id=58ED9C9C35E433EE58764D62892B4FFD518A3CD0" " ipv6=[2a00:1158:2:cd00:0:74:6f:72]:443" /* nickname= */ +/* extrainfo=0 */ , "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74" /* nickname= */ +/* extrainfo=0 */ , "120.29.217.46:80 orport=443 id=5E853C94AB1F655E9C908924370A0A6707508C62" /* nickname= */ +/* extrainfo=0 */ , "109.163.234.5:80 orport=443 id=5EB8D862E70981B8690DEDEF546789E26AB2BD24" /* nickname= */ +/* extrainfo=0 */ , "95.128.43.164:80 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90" " ipv6=[2a02:ec0:209:10::4]:443" /* nickname= */ +/* extrainfo=0 */ , "163.172.139.104:8080 orport=443 id=68F175CCABE727AA2D2309BCD8789499CEE36ED7" /* nickname= */ +/* extrainfo=0 */ , "85.214.62.48:80 orport=443 id=6A7551EEE18F78A9813096E82BF84F740D32B911" /* nickname= */ +/* extrainfo=0 */ , "80.127.137.19:80 orport=443 id=6EF897645B79B6CB35E853B32506375014DE3621" " ipv6=[2001:981:47c1:1::6]:443" /* nickname= */ +/* extrainfo=0 */ , "95.183.48.12:80 orport=443 id=7187CED1A3871F837D0E60AC98F374AC541CB0DA" /* nickname= */ +/* extrainfo=0 */ , "85.214.151.72:9030 orport=9001 id=722D365140C8C52DBB3C9FF6986E3CEFFE2BA812" /* nickname= */ +/* extrainfo=0 */ , "85.235.250.88:80 orport=443 id=72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE" /* nickname= */ +/* extrainfo=0 */ , "176.31.191.26:80 orport=443 id=7350AB9ED7568F22745198359373C04AC783C37C" /* nickname= */ +/* extrainfo=0 */ , "134.119.36.135:80 orport=443 id=763C9556602BD6207771A7A3D958091D44C43228" " ipv6=[2a00:1158:3::2a8]:993" /* nickname= */ +/* extrainfo=0 */ , "188.166.133.133:9030 orport=9001 id=774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7" " ipv6=[2a03:b0c0:2:d0::5:f001]:9001" /* nickname= */ +/* extrainfo=0 */ , "81.30.158.213:9030 orport=9001 id=789EA6C9AE9ADDD8760903171CFA9AC5741B0C70" " ipv6=[2001:4ba0:cafe:e84::1]:9001" /* nickname= */ +/* extrainfo=0 */ , "171.25.193.131:80 orport=443 id=79861CF8522FC637EF046F7688F5289E49D94576" /* nickname= */ +/* extrainfo=0 */ , "82.223.21.74:9030 orport=9001 id=7A32C9519D80CA458FC8B034A28F5F6815649A98" " ipv6=[2001:470:53e0::cafe]:9050" /* nickname= */ +/* extrainfo=0 */ , "51.254.136.195:80 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63" /* nickname= */ +/* extrainfo=0 */ , "193.11.114.45:9031 orport=9002 id=80AAF8D5956A43C197104CEF2550CD42D165C6FB" /* nickname= */ +/* extrainfo=0 */ , "192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F" " ipv6=[2605:e200:d00c:c01d::1111]:9002" /* nickname= */ +/* extrainfo=0 */ , "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7" /* nickname= */ +/* extrainfo=0 */ , "188.166.23.127:80 orport=443 id=8672E8A01B4D3FA4C0BBE21C740D4506302EA487" " ipv6=[2a03:b0c0:2:d0::27b:7001]:9050" /* nickname= */ +/* extrainfo=0 */ , "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" /* nickname= */ +/* extrainfo=0 */ , "212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C" /* nickname= */ +/* extrainfo=0 */ , "163.172.194.53:9030 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451" " ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001" /* nickname= */ +/* extrainfo=0 */ , "178.254.44.135:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422" /* nickname= */ +/* extrainfo=0 */ , "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605" " ipv6=[2001:41d0:e:f67::114]:9001" /* nickname= */ +/* extrainfo=0 */ , "173.255.245.116:9030 orport=9001 id=91E4015E1F82DAF0121D62267E54A1F661AB6DC7" /* nickname= */ +/* extrainfo=0 */ , "51.255.41.65:9030 orport=9001 id=9231DF741915AA1630031A93026D88726877E93A" /* nickname= */ +/* extrainfo=0 */ , "178.16.208.57:80 orport=443 id=92CFD9565B24646CAC2D172D3DB503D69E777B8A" " ipv6=[2a00:1c20:4089:1234:7825:2c5d:1ecd:c66f]:443" /* nickname= */ +/* extrainfo=0 */ , "91.219.237.244:80 orport=443 id=92ECC9E0E2AF81BB954719B189AC362E254AD4A5" /* nickname= */ +/* extrainfo=0 */ , "204.8.156.142:80 orport=443 id=94C4B7B8C50C86A92B6A20107539EE2678CF9A28" /* nickname= */ +/* extrainfo=0 */ , "163.172.223.200:80 orport=443 id=998BF3ED7F70E33D1C307247B9626D9E7573C438" /* nickname= */ +/* extrainfo=0 */ , "81.7.10.93:31336 orport=31337 id=99E246DB480B313A3012BC3363093CC26CD209C7" /* nickname= */ +/* extrainfo=0 */ , "91.229.20.27:9030 orport=9001 id=9A0D54D3A6D2E0767596BF1515E6162A75B3293F" /* nickname= */ +/* extrainfo=0 */ , "66.111.2.20:9030 orport=9001 id=9A68B85A02318F4E7E87F2828039FBD5D75B0142" /* nickname= */ +/* extrainfo=0 */ , "185.100.86.128:9030 orport=9001 id=9B31F1F1C1554F9FFB3455911F82E818EF7C7883" /* nickname= */ +/* extrainfo=0 */ , "5.9.151.241:9030 orport=4223 id=9BF04559224F0F1C3C953D641F1744AF0192543A" " ipv6=[2a01:4f8:190:34f0::2]:4223" /* nickname= */ +/* extrainfo=0 */ , "86.105.212.130:9030 orport=443 id=9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022" /* nickname= */ +/* extrainfo=0 */ , "178.254.20.134:80 orport=443 id=9F5068310818ED7C70B0BC4087AB55CB12CB4377" /* nickname= */ +/* extrainfo=0 */ , "46.28.110.244:80 orport=443 id=9F7D6E6420183C2B76D3CE99624EBC98A21A967E" /* nickname= */ +/* extrainfo=0 */ , "91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334" " ipv6=[2001:41d0:1:8989::1]:4052" /* nickname= */ +/* extrainfo=0 */ , "178.62.22.36:80 orport=443 id=A0766C0D3A667A3232C7D569DE94A28F9922FCB1" " ipv6=[2a03:b0c0:1:d0::174:1]:9050" /* nickname= */ +/* extrainfo=0 */ , "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" " ipv6=[2001:67c:289c:3::77]:443" /* nickname= */ +/* extrainfo=0 */ , "171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE" " ipv6=[2001:67c:289c:3::78]:443" /* nickname= */ +/* extrainfo=0 */ , "163.172.149.122:80 orport=443 id=A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2" /* nickname= */ +/* extrainfo=0 */ , "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" /* nickname= */ +/* extrainfo=0 */ , "109.163.234.9:80 orport=443 id=ABF7FBF389C9A747938B639B20E80620B460B2A9" /* nickname= */ +/* extrainfo=0 */ , "86.59.119.88:80 orport=443 id=ACD889D86E02EDDAB1AFD81F598C0936238DC6D0" /* nickname= */ +/* extrainfo=0 */ , "185.129.62.62:9030 orport=9001 id=ACDD9E85A05B127BA010466C13C8C47212E8A38F" " ipv6=[2a06:d380:0:3700::62]:9001" /* nickname= */ +/* extrainfo=0 */ , "163.172.131.88:80 orport=443 id=AD253B49E303C6AB1E048B014392AC569E8A7DAE" " ipv6=[2001:bc8:4400:2100::2:1009]:443" /* nickname= */ +/* extrainfo=0 */ , "31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D" /* nickname= */ +/* extrainfo=0 */ , "37.187.7.74:80 orport=443 id=AEA43CB1E47BE5F8051711B2BF01683DB1568E05" " ipv6=[2001:41d0:a:74a::1]:443" /* nickname= */ +/* extrainfo=0 */ , "46.28.205.170:80 orport=443 id=AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76" /* nickname= */ +/* extrainfo=0 */ , "5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2" /* nickname= */ +/* extrainfo=0 */ , "212.129.62.232:80 orport=443 id=B143D439B72D239A419F8DCE07B8A8EB1B486FA7" /* nickname= */ +/* extrainfo=0 */ , "198.199.64.217:80 orport=443 id=B1D81825CFD7209BD1B4520B040EF5653C204A23" " ipv6=[2604:a880:400:d0::1a9:b001]:9050" /* nickname= */ +/* extrainfo=0 */ , "136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664" /* nickname= */ +/* extrainfo=0 */ , "178.16.208.60:80 orport=443 id=B44FBE5366AD98B46D829754FA4AC599BAE41A6A" " ipv6=[2a00:1c20:4089:1234:67bc:79f3:61c0:6e49]:443" /* nickname= */ +/* extrainfo=0 */ , "93.115.97.242:9030 orport=9001 id=B5212DB685A2A0FCFBAE425738E478D12361710D" /* nickname= */ +/* extrainfo=0 */ , "81.2.209.10:443 orport=80 id=B6904ADD4C0D10CDA7179E051962350A69A63243" " ipv6=[2001:15e8:201:1::d10a]:80" /* nickname= */ +/* extrainfo=0 */ , "193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E" /* nickname= */ +/* extrainfo=0 */ , "85.248.227.164:444 orport=9002 id=B84F248233FEA90CAD439F292556A3139F6E1B82" " ipv6=[2a00:1298:8011:212::164]:9004" /* nickname= */ +/* extrainfo=0 */ , "89.163.247.43:9030 orport=9001 id=BC7ACFAC04854C77167C7D66B7E471314ED8C410" " ipv6=[2001:4ba0:fff7:25::5]:9001" /* nickname= */ +/* extrainfo=0 */ , "198.96.155.3:8080 orport=5001 id=BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E" /* nickname= */ +/* extrainfo=0 */ , "128.199.55.207:9030 orport=9001 id=BCEF908195805E03E92CCFE669C48738E556B9C5" " ipv6=[2a03:b0c0:2:d0::158:3001]:9001" /* nickname= */ +/* extrainfo=0 */ , "185.35.202.221:9030 orport=9001 id=C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08" " ipv6=[2a02:ed06::221]:9001" /* nickname= */ +/* extrainfo=0 */ , "213.239.217.18:1338 orport=1337 id=C37BC191AC389179674578C3E6944E925FE186C2" " ipv6=[2a01:4f8:a0:746a:101:1:1:1]:1337" /* nickname= */ +/* extrainfo=0 */ , "188.138.112.60:1433 orport=1521 id=C414F28FD2BEC1553024299B31D4E726BEB8E788" /* nickname= */ +/* extrainfo=0 */ , "85.248.227.163:443 orport=9001 id=C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9" " ipv6=[2a00:1298:8011:212::163]:9003" /* nickname= */ +/* extrainfo=0 */ , "178.62.199.226:80 orport=443 id=CBEFF7BA4A4062045133C053F2D70524D8BBE5BE" " ipv6=[2a03:b0c0:2:d0::b7:5001]:443" /* nickname= */ +/* extrainfo=0 */ , "134.119.3.164:9030 orport=9001 id=D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE" /* nickname= */ +/* extrainfo=0 */ , "31.171.155.108:9030 orport=9001 id=D3E5EDDBE5159388704D6785BE51930AAFACEC6F" /* nickname= */ +/* extrainfo=0 */ , "37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A" /* nickname= */ +/* extrainfo=0 */ , "166.82.21.200:9030 orport=9029 id=D5C33F3E203728EDF8361EA868B2939CCC43FAFB" /* nickname= */ +/* extrainfo=0 */ , "185.14.185.240:9030 orport=443 id=D62FB817B0288085FAC38A6DC8B36DCD85B70260" /* nickname= */ +/* extrainfo=0 */ , "46.101.169.151:9030 orport=9001 id=D760C5B436E42F93D77EF2D969157EEA14F9B39C" " ipv6=[2a03:b0c0:3:d0::74f:a001]:9001" /* nickname= */ +/* extrainfo=0 */ , "46.4.111.124:9030 orport=9001 id=D9065F9E57899B3D272AA212317AF61A9B14D204" /* nickname= */ +/* extrainfo=0 */ , "193.35.52.53:9030 orport=9001 id=DAA39FC00B196B353C2A271459C305C429AF09E4" /* nickname= */ +/* extrainfo=0 */ , "178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB" " ipv6=[2001:41d0:2:a683::251]:443" /* nickname= */ +/* extrainfo=0 */ , "178.62.173.203:9030 orport=9001 id=DD85503F2D1F52EF9EAD621E942298F46CD2FC10" " ipv6=[2a03:b0c0:0:1010::a4:b001]:9001" /* nickname= */ +/* extrainfo=0 */ , "5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8" /* nickname= */ +/* extrainfo=0 */ , "78.24.75.53:9030 orport=9001 id=DEB73705B2929AE9BE87091607388939332EF123" /* nickname= */ +/* extrainfo=0 */ , "92.222.38.67:80 orport=443 id=DED6892FF89DBD737BA689698A171B2392EB3E82" /* nickname= */ +/* extrainfo=0 */ , "166.70.207.2:9030 orport=9001 id=E3DB2E354B883B59E8DC56B3E7A353DDFD457812" /* nickname= */ +/* extrainfo=0 */ , "46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D" /* nickname= */ +/* extrainfo=0 */ , "167.114.35.28:9030 orport=9001 id=E65D300F11E1DB12C534B0146BDAB6972F1A8A48" /* nickname= */ +/* extrainfo=0 */ , "131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8" /* nickname= */ +/* extrainfo=0 */ , "192.87.28.28:9030 orport=9001 id=ED2338CAC2711B3E331392E1ED2831219B794024" /* nickname= */ +/* extrainfo=0 */ , "192.99.212.139:80 orport=443 id=F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC" /* nickname= */ +/* extrainfo=0 */ , "212.238.208.48:9030 orport=9001 id=F406219CDD339026D160E53FCA0EF6857C70F109" " ipv6=[2001:984:a8fb:1:ba27:ebff:feac:c109]:9001" /* nickname= */ +/* extrainfo=0 */ , "46.28.207.141:80 orport=443 id=F69BED36177ED727706512BA6A97755025EEA0FB" /* nickname= */ +/* extrainfo=0 */ , "78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE" /* nickname= */ +/* extrainfo=0 */ , "178.254.13.126:80 orport=443 id=F9246DEF2B653807236DA134F2AEAB103D58ABFE" /* nickname= */ +/* extrainfo=0 */ , "185.96.180.29:80 orport=443 id=F93D8F37E35C390BCAD9F9069E13085B745EC216" /* nickname= */ +/* extrainfo=0 */ , "86.59.119.83:80 orport=443 id=FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B" /* nickname= */ +/* extrainfo=0 */ , "192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC" /* nickname= */ +/* extrainfo=0 */ , "149.56.45.200:9030 orport=9001 id=FE296180018833AF03A8EACD5894A614623D3F76" /* nickname= */ +/* extrainfo=0 */ , "193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07" " ipv6=[2001:6b0:7:125::243]:9001" /* nickname= */ +/* extrainfo=0 */ ,

1 0

[tor/master] Add blank nicknames to the current fallback file
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 067617608c6314e1ab92e219b247d89ed7ec9591 Author: teor <teor2345(a)gmail.com> Date: Sat Dec 23 00:34:52 2017 +1100 Add blank nicknames to the current fallback file Using this script: sed -i.bak $'s|^,$|/* nickname= */\\\n,|' src/or/fallback_dirs.inc (Due to embedded newlines, this script only works in bash.) This allows us to check that the code compiles, and the unit tests pass. And it allows downstream users stem and atlas to adapt to the new format. The upcoming fallback rebuild will automatically generate this new format, with actual relay nicknames. Follow-up to 24600. --- src/or/fallback_dirs.inc | 151 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 397121b12..5624ad49f 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -17,356 +17,507 @@ Onionoo Source: uptime Date: 2017-05-16 07:00:00 Version: 4.0 URL: https:onionoo.torproject.orguptime?first_seen_days=30-&flag=V2Dir&type=relay&last_seen_days=-0 */ "176.10.104.240:80 orport=443 id=0111BA9B604669E636FFD5B503F382A4B7AD6E80" +/* nickname= */ , "193.171.202.146:9030 orport=9001 id=01A9258A46E97FF8B2CAC7910577862C14F2C524" +/* nickname= */ , "185.100.85.61:80 orport=443 id=025B66CEBC070FCB0519D206CF0CF4965C20C96E" +/* nickname= */ , "185.97.32.18:9030 orport=9001 id=04250C3835019B26AA6764E85D836088BE441088" +/* nickname= */ , "5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB" " ipv6=[2a01:4f8:162:51e2::2]:9001" +/* nickname= */ , "109.163.234.8:80 orport=443 id=0818DAE0E2DDF795AEDEAC60B15E71901084F281" +/* nickname= */ , "163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F" +/* nickname= */ , "5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6" " ipv6=[2001:41d0:8:b1c7::1]:443" +/* nickname= */ , "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163" +/* nickname= */ , "185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0" +/* nickname= */ , "95.85.8.226:80 orport=443 id=1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423" +/* nickname= */ , "193.11.114.43:9030 orport=9001 id=12AD30E5D25AA67F519780E2111E611A455FDC89" " ipv6=[2001:6b0:30:1000::99]:9050" +/* nickname= */ , "37.157.195.87:8030 orport=443 id=12FD624EE73CEF37137C90D38B2406A66F68FAA2" +/* nickname= */ , "178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B" " ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443" +/* nickname= */ , "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" " ipv6=[2a01:4f8:190:9490::dead]:443" +/* nickname= */ , "178.62.60.37:80 orport=443 id=175921396C7C426309AB03775A9930B6F611F794" +/* nickname= */ , "204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70" +/* nickname= */ , "5.9.158.75:80 orport=443 id=1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA" " ipv6=[2a01:4f8:190:514a::2]:443" +/* nickname= */ , "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8" +/* nickname= */ , "91.219.237.229:80 orport=443 id=1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7" +/* nickname= */ , "212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68" " ipv6=[2001:bc8:4400:2100::f03]:9001" +/* nickname= */ , "144.76.163.93:9030 orport=9001 id=22F08CF09764C4E8982640D77F71ED72FF26A9AC" +/* nickname= */ , "163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207" +/* nickname= */ , "37.200.98.5:80 orport=443 id=231C2B9C8C31C295C472D031E06964834B745996" " ipv6=[2a00:1158:3::11a]:993" +/* nickname= */ , "212.47.240.10:82 orport=443 id=2A4C448784F5A83AFE6C78DA357D5E31F7989DEB" +/* nickname= */ , "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" +/* nickname= */ , "97.74.237.196:9030 orport=9001 id=2F0F32AB1E5B943CA7D062C03F18960C86E70D94" +/* nickname= */ , "107.170.101.39:9030 orport=443 id=30973217E70AF00EBE51797FF6D9AA720A902EAA" +/* nickname= */ , "64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2" +/* nickname= */ , "212.83.154.33:8080 orport=8443 id=322C6E3A973BC10FC36DE3037AD27BC89F14723B" +/* nickname= */ , "109.105.109.162:52860 orport=60784 id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F" " ipv6=[2001:948:7:2::163]:5001" +/* nickname= */ , "163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB" " ipv6=[2001:bc8:38cb:201::8]:9001" +/* nickname= */ , "217.79.190.25:9030 orport=9090 id=361D33C96D0F161275EE67E2C91EE10B276E778B" +/* nickname= */ , "37.187.22.87:9030 orport=9001 id=36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400" " ipv6=[2001:41d0:a:1657::1]:9001" +/* nickname= */ , "62.210.92.11:9130 orport=9101 id=387B065A38E4DAA16D9D41C2964ECBC4B31D30FF" " ipv6=[2001:bc8:338c::1]:9101" +/* nickname= */ , "198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92" +/* nickname= */ , "164.132.77.175:9030 orport=9001 id=3B33F6FCA645AD4E91428A3AF7DC736AD9FB727B" +/* nickname= */ , "212.47.230.49:9030 orport=9001 id=3D6D0771E54056AEFC28BB1DE816951F11826E97" +/* nickname= */ , "176.10.107.180:9030 orport=9001 id=3D7E274A87D9A89AF064C13D1EE4CA1F184F2600" +/* nickname= */ , "217.79.179.177:9030 orport=9001 id=3E53D3979DB07EFD736661C934A1DED14127B684" " ipv6=[2001:4ba0:fff9:131:6c4f::90d3]:9001" +/* nickname= */ , "178.62.86.96:9030 orport=9001 id=439D0447772CB107B886F7782DBC201FA26B92D1" " ipv6=[2a03:b0c0:1:d0::3cf:7001]:9050" +/* nickname= */ , "163.172.157.213:8080 orport=443 id=4623A9EC53BFD83155929E56D6F7B55B5E718C24" +/* nickname= */ , "31.31.78.49:80 orport=443 id=46791D156C9B6C255C2665D4D8393EC7DBAA7798" +/* nickname= */ , "69.162.139.9:9030 orport=9001 id=4791FC0692EAB60DF2BCCAFF940B95B74E7654F6" " ipv6=[2607:f128:40:1212::45a2:8b09]:9001" +/* nickname= */ , "51.254.246.203:9030 orport=9001 id=47B596B81C9E6277B98623A84B7629798A16E8D5" +/* nickname= */ , "37.187.102.186:9030 orport=9001 id=489D94333DF66D57FFE34D9D59CC2D97E2CB0053" " ipv6=[2001:41d0:a:26ba::1]:9001" +/* nickname= */ , "188.165.194.195:9030 orport=9001 id=49E7AD01BB96F6FE3AB8C3B15BD2470B150354DF" +/* nickname= */ , "62.102.148.67:80 orport=443 id=4A0C3E177AF684581EF780981AEAF51A98A6B5CF" +/* nickname= */ , "51.254.101.242:9002 orport=9001 id=4CC9CC9195EC38645B699A33307058624F660CCF" +/* nickname= */ , "81.7.16.182:80 orport=443 id=51E1CF613FD6F9F11FE24743C91D6F9981807D82" " ipv6=[2a02:180:1:1::517:10b6]:993" +/* nickname= */ , "94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69" +/* nickname= */ , "95.130.12.119:80 orport=443 id=587E0A9552E4274B251F29B5B2673D38442EE4BF" +/* nickname= */ , "185.21.100.50:9030 orport=9001 id=58ED9C9C35E433EE58764D62892B4FFD518A3CD0" " ipv6=[2a00:1158:2:cd00:0:74:6f:72]:443" +/* nickname= */ , "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74" +/* nickname= */ , "120.29.217.46:80 orport=443 id=5E853C94AB1F655E9C908924370A0A6707508C62" +/* nickname= */ , "109.163.234.5:80 orport=443 id=5EB8D862E70981B8690DEDEF546789E26AB2BD24" +/* nickname= */ , "95.128.43.164:80 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90" " ipv6=[2a02:ec0:209:10::4]:443" +/* nickname= */ , "163.172.139.104:8080 orport=443 id=68F175CCABE727AA2D2309BCD8789499CEE36ED7" +/* nickname= */ , "85.214.62.48:80 orport=443 id=6A7551EEE18F78A9813096E82BF84F740D32B911" +/* nickname= */ , "80.127.137.19:80 orport=443 id=6EF897645B79B6CB35E853B32506375014DE3621" " ipv6=[2001:981:47c1:1::6]:443" +/* nickname= */ , "95.183.48.12:80 orport=443 id=7187CED1A3871F837D0E60AC98F374AC541CB0DA" +/* nickname= */ , "85.214.151.72:9030 orport=9001 id=722D365140C8C52DBB3C9FF6986E3CEFFE2BA812" +/* nickname= */ , "85.235.250.88:80 orport=443 id=72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE" +/* nickname= */ , "176.31.191.26:80 orport=443 id=7350AB9ED7568F22745198359373C04AC783C37C" +/* nickname= */ , "134.119.36.135:80 orport=443 id=763C9556602BD6207771A7A3D958091D44C43228" " ipv6=[2a00:1158:3::2a8]:993" +/* nickname= */ , "188.166.133.133:9030 orport=9001 id=774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7" " ipv6=[2a03:b0c0:2:d0::5:f001]:9001" +/* nickname= */ , "81.30.158.213:9030 orport=9001 id=789EA6C9AE9ADDD8760903171CFA9AC5741B0C70" " ipv6=[2001:4ba0:cafe:e84::1]:9001" +/* nickname= */ , "171.25.193.131:80 orport=443 id=79861CF8522FC637EF046F7688F5289E49D94576" +/* nickname= */ , "82.223.21.74:9030 orport=9001 id=7A32C9519D80CA458FC8B034A28F5F6815649A98" " ipv6=[2001:470:53e0::cafe]:9050" +/* nickname= */ , "51.254.136.195:80 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63" +/* nickname= */ , "193.11.114.45:9031 orport=9002 id=80AAF8D5956A43C197104CEF2550CD42D165C6FB" +/* nickname= */ , "192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F" " ipv6=[2605:e200:d00c:c01d::1111]:9002" +/* nickname= */ , "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7" +/* nickname= */ , "188.166.23.127:80 orport=443 id=8672E8A01B4D3FA4C0BBE21C740D4506302EA487" " ipv6=[2a03:b0c0:2:d0::27b:7001]:9050" +/* nickname= */ , "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" +/* nickname= */ , "212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C" +/* nickname= */ , "163.172.194.53:9030 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451" " ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001" +/* nickname= */ , "178.254.44.135:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422" +/* nickname= */ , "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605" " ipv6=[2001:41d0:e:f67::114]:9001" +/* nickname= */ , "173.255.245.116:9030 orport=9001 id=91E4015E1F82DAF0121D62267E54A1F661AB6DC7" +/* nickname= */ , "51.255.41.65:9030 orport=9001 id=9231DF741915AA1630031A93026D88726877E93A" +/* nickname= */ , "178.16.208.57:80 orport=443 id=92CFD9565B24646CAC2D172D3DB503D69E777B8A" " ipv6=[2a00:1c20:4089:1234:7825:2c5d:1ecd:c66f]:443" +/* nickname= */ , "91.219.237.244:80 orport=443 id=92ECC9E0E2AF81BB954719B189AC362E254AD4A5" +/* nickname= */ , "204.8.156.142:80 orport=443 id=94C4B7B8C50C86A92B6A20107539EE2678CF9A28" +/* nickname= */ , "163.172.223.200:80 orport=443 id=998BF3ED7F70E33D1C307247B9626D9E7573C438" +/* nickname= */ , "81.7.10.93:31336 orport=31337 id=99E246DB480B313A3012BC3363093CC26CD209C7" +/* nickname= */ , "91.229.20.27:9030 orport=9001 id=9A0D54D3A6D2E0767596BF1515E6162A75B3293F" +/* nickname= */ , "66.111.2.20:9030 orport=9001 id=9A68B85A02318F4E7E87F2828039FBD5D75B0142" +/* nickname= */ , "185.100.86.128:9030 orport=9001 id=9B31F1F1C1554F9FFB3455911F82E818EF7C7883" +/* nickname= */ , "5.9.151.241:9030 orport=4223 id=9BF04559224F0F1C3C953D641F1744AF0192543A" " ipv6=[2a01:4f8:190:34f0::2]:4223" +/* nickname= */ , "86.105.212.130:9030 orport=443 id=9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022" +/* nickname= */ , "178.254.20.134:80 orport=443 id=9F5068310818ED7C70B0BC4087AB55CB12CB4377" +/* nickname= */ , "46.28.110.244:80 orport=443 id=9F7D6E6420183C2B76D3CE99624EBC98A21A967E" +/* nickname= */ , "91.121.84.137:4952 orport=4052 id=9FBEB75E8BC142565F12CBBE078D63310236A334" " ipv6=[2001:41d0:1:8989::1]:4052" +/* nickname= */ , "178.62.22.36:80 orport=443 id=A0766C0D3A667A3232C7D569DE94A28F9922FCB1" " ipv6=[2a03:b0c0:1:d0::174:1]:9050" +/* nickname= */ , "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" " ipv6=[2001:67c:289c:3::77]:443" +/* nickname= */ , "171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE" " ipv6=[2001:67c:289c:3::78]:443" +/* nickname= */ , "163.172.149.122:80 orport=443 id=A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2" +/* nickname= */ , "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" +/* nickname= */ , "109.163.234.9:80 orport=443 id=ABF7FBF389C9A747938B639B20E80620B460B2A9" +/* nickname= */ , "86.59.119.88:80 orport=443 id=ACD889D86E02EDDAB1AFD81F598C0936238DC6D0" +/* nickname= */ , "185.129.62.62:9030 orport=9001 id=ACDD9E85A05B127BA010466C13C8C47212E8A38F" " ipv6=[2a06:d380:0:3700::62]:9001" +/* nickname= */ , "163.172.131.88:80 orport=443 id=AD253B49E303C6AB1E048B014392AC569E8A7DAE" " ipv6=[2001:bc8:4400:2100::2:1009]:443" +/* nickname= */ , "31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D" +/* nickname= */ , "37.187.7.74:80 orport=443 id=AEA43CB1E47BE5F8051711B2BF01683DB1568E05" " ipv6=[2001:41d0:a:74a::1]:443" +/* nickname= */ , "46.28.205.170:80 orport=443 id=AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76" +/* nickname= */ , "5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2" +/* nickname= */ , "212.129.62.232:80 orport=443 id=B143D439B72D239A419F8DCE07B8A8EB1B486FA7" +/* nickname= */ , "198.199.64.217:80 orport=443 id=B1D81825CFD7209BD1B4520B040EF5653C204A23" " ipv6=[2604:a880:400:d0::1a9:b001]:9050" +/* nickname= */ , "136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664" +/* nickname= */ , "178.16.208.60:80 orport=443 id=B44FBE5366AD98B46D829754FA4AC599BAE41A6A" " ipv6=[2a00:1c20:4089:1234:67bc:79f3:61c0:6e49]:443" +/* nickname= */ , "93.115.97.242:9030 orport=9001 id=B5212DB685A2A0FCFBAE425738E478D12361710D" +/* nickname= */ , "81.2.209.10:443 orport=80 id=B6904ADD4C0D10CDA7179E051962350A69A63243" " ipv6=[2001:15e8:201:1::d10a]:80" +/* nickname= */ , "193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E" +/* nickname= */ , "85.248.227.164:444 orport=9002 id=B84F248233FEA90CAD439F292556A3139F6E1B82" " ipv6=[2a00:1298:8011:212::164]:9004" +/* nickname= */ , "89.163.247.43:9030 orport=9001 id=BC7ACFAC04854C77167C7D66B7E471314ED8C410" " ipv6=[2001:4ba0:fff7:25::5]:9001" +/* nickname= */ , "198.96.155.3:8080 orport=5001 id=BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E" +/* nickname= */ , "128.199.55.207:9030 orport=9001 id=BCEF908195805E03E92CCFE669C48738E556B9C5" " ipv6=[2a03:b0c0:2:d0::158:3001]:9001" +/* nickname= */ , "185.35.202.221:9030 orport=9001 id=C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08" " ipv6=[2a02:ed06::221]:9001" +/* nickname= */ , "213.239.217.18:1338 orport=1337 id=C37BC191AC389179674578C3E6944E925FE186C2" " ipv6=[2a01:4f8:a0:746a:101:1:1:1]:1337" +/* nickname= */ , "188.138.112.60:1433 orport=1521 id=C414F28FD2BEC1553024299B31D4E726BEB8E788" +/* nickname= */ , "85.248.227.163:443 orport=9001 id=C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9" " ipv6=[2a00:1298:8011:212::163]:9003" +/* nickname= */ , "178.62.199.226:80 orport=443 id=CBEFF7BA4A4062045133C053F2D70524D8BBE5BE" " ipv6=[2a03:b0c0:2:d0::b7:5001]:443" +/* nickname= */ , "134.119.3.164:9030 orport=9001 id=D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE" +/* nickname= */ , "31.171.155.108:9030 orport=9001 id=D3E5EDDBE5159388704D6785BE51930AAFACEC6F" +/* nickname= */ , "37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A" +/* nickname= */ , "166.82.21.200:9030 orport=9029 id=D5C33F3E203728EDF8361EA868B2939CCC43FAFB" +/* nickname= */ , "185.14.185.240:9030 orport=443 id=D62FB817B0288085FAC38A6DC8B36DCD85B70260" +/* nickname= */ , "46.101.169.151:9030 orport=9001 id=D760C5B436E42F93D77EF2D969157EEA14F9B39C" " ipv6=[2a03:b0c0:3:d0::74f:a001]:9001" +/* nickname= */ , "46.4.111.124:9030 orport=9001 id=D9065F9E57899B3D272AA212317AF61A9B14D204" +/* nickname= */ , "193.35.52.53:9030 orport=9001 id=DAA39FC00B196B353C2A271459C305C429AF09E4" +/* nickname= */ , "178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB" " ipv6=[2001:41d0:2:a683::251]:443" +/* nickname= */ , "178.62.173.203:9030 orport=9001 id=DD85503F2D1F52EF9EAD621E942298F46CD2FC10" " ipv6=[2a03:b0c0:0:1010::a4:b001]:9001" +/* nickname= */ , "5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8" +/* nickname= */ , "78.24.75.53:9030 orport=9001 id=DEB73705B2929AE9BE87091607388939332EF123" +/* nickname= */ , "92.222.38.67:80 orport=443 id=DED6892FF89DBD737BA689698A171B2392EB3E82" +/* nickname= */ , "166.70.207.2:9030 orport=9001 id=E3DB2E354B883B59E8DC56B3E7A353DDFD457812" +/* nickname= */ , "46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D" +/* nickname= */ , "167.114.35.28:9030 orport=9001 id=E65D300F11E1DB12C534B0146BDAB6972F1A8A48" +/* nickname= */ , "131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8" +/* nickname= */ , "192.87.28.28:9030 orport=9001 id=ED2338CAC2711B3E331392E1ED2831219B794024" +/* nickname= */ , "192.99.212.139:80 orport=443 id=F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC" +/* nickname= */ , "212.238.208.48:9030 orport=9001 id=F406219CDD339026D160E53FCA0EF6857C70F109" " ipv6=[2001:984:a8fb:1:ba27:ebff:feac:c109]:9001" +/* nickname= */ , "46.28.207.141:80 orport=443 id=F69BED36177ED727706512BA6A97755025EEA0FB" +/* nickname= */ , "78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE" +/* nickname= */ , "178.254.13.126:80 orport=443 id=F9246DEF2B653807236DA134F2AEAB103D58ABFE" +/* nickname= */ , "185.96.180.29:80 orport=443 id=F93D8F37E35C390BCAD9F9069E13085B745EC216" +/* nickname= */ , "86.59.119.83:80 orport=443 id=FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B" +/* nickname= */ , "192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC" +/* nickname= */ , "149.56.45.200:9030 orport=9001 id=FE296180018833AF03A8EACD5894A614623D3F76" +/* nickname= */ , "193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07" " ipv6=[2001:6b0:7:125::243]:9001" +/* nickname= */ ,

1 0

[tor/master] Add a nickname to each fallback in a C comment
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 561f18e724c15c0ad22d2915786fdb8e6ddd9c30 Author: teor <teor2345(a)gmail.com> Date: Sat Dec 23 00:23:12 2017 +1100 Add a nickname to each fallback in a C comment This makes it easier for operators to find their relays, and allows stem to use nicknames to identify fallbacks. Implements ticket 24600. --- changes/ticket24600 | 5 +++++ scripts/maint/updateFallbackDirs.py | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/changes/ticket24600 b/changes/ticket24600 new file mode 100644 index 000000000..c464d0b16 --- /dev/null +++ b/changes/ticket24600 @@ -0,0 +1,5 @@ + o Minor features (fallback directory mirrors): + - Add a nickname to each fallback in a C comment. This makes it easier for + operators to find their relays, and allows stem to use nicknames to + identify fallbacks. + Implements ticket 24600. diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 7bd6fae0e..4e4000dce 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1331,6 +1331,7 @@ class Candidate(object): def fallbackdir_info(self, dl_speed_ok): # "address:dirport orport=port id=fingerprint" # "[ipv6=addr:orport]" + # /* nickname=name */ # , # # Do we want a C string, or a commented-out string? @@ -1355,6 +1356,12 @@ class Candidate(object): if self.has_ipv6(): s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport) s += '\n' + if not comment_string: + s += '/* ' + s += 'nickname=%s'%(cleanse_c_string(self._data['nickname'])) + if not comment_string: + s += ' */' + s += '\n' s += ',' if comment_string: s += '\n'

1 0

[tor/master] Stop refusing fallbacks on the same machine
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 5045dde956ec4647cbef5bd0fe81a05f3444012b Author: teor <teor2345(a)gmail.com> Date: Fri Jan 5 00:01:15 2018 +1100 Stop refusing fallbacks on the same machine We only occasionally checked for fallbacks on the same machine. And I'm not convinced it makes much of a difference with ~150 fallbacks. Part of #22321. --- scripts/maint/fallback.whitelist | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index c6e23286d..b8bb82fd0 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -103,8 +103,8 @@ 171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A ipv6=[2001:67c:289c:3::77]:443 171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE ipv6=[2001:67c:289c:3::78]:443 171.25.193.20:80 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02 ipv6=[2001:67c:289c::20]:443 -# OK, but same machine as DD8BD7307017407FCC36F8D04A688F74A0774C02 -#171.25.193.25:80 orport=443 id=185663B7C12777F052B2C2D23D7A239D8DA88A0F ipv6=[2001:67c:289c::25]:443 +# same machine as DD8BD7307017407FCC36F8D04A688F74A0774C02 +171.25.193.25:80 orport=443 id=185663B7C12777F052B2C2D23D7A239D8DA88A0F ipv6=[2001:67c:289c::25]:443 # Email sent directly to teor, verified using relay contact info 212.47.229.2:9030 orport=9001 id=20462CBA5DA4C2D963567D17D0B7249718114A68 ipv6=[2001:bc8:4400:2100::f03]:9001 @@ -623,8 +623,8 @@ # Email sent directly to teor, verified using relay contact info 192.87.28.28:9030 orport=9001 id=ED2338CAC2711B3E331392E1ED2831219B794024 -# OK, but same machine as ED2338CAC2711B3E331392E1ED2831219B794024 -#192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7 +# same machine as ED2338CAC2711B3E331392E1ED2831219B794024 +192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7 # https://twitter.com/kosjoli/status/719507270904758272 85.10.202.87:9030 orport=9001 id=971AFB23C168DCD8EDA17473C1C452B359DE3A5A @@ -793,11 +793,11 @@ 178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB ipv6=[2001:41d0:2:a683::251]:443 # Email sent directly to teor, verified using relay contact info -#31.185.104.19:80 orport=443 id=9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D -# OK, but on same machine as 9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D +31.185.104.19:80 orport=443 id=9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D +# same machine as 9EAD5B2D3DBD96DBC80DCE423B0C345E920A758D 31.185.104.20:80 orport=443 id=ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D -#31.185.104.21:80 orport=443 id=C2AAB088555850FC434E68943F551072042B85F1 -#31.185.104.22:80 orport=443 id=5BA3A52760A0EABF7E7C3ED3048A77328FF0F148 +31.185.104.21:80 orport=443 id=C2AAB088555850FC434E68943F551072042B85F1 +31.185.104.22:80 orport=443 id=5BA3A52760A0EABF7E7C3ED3048A77328FF0F148 # Email sent directly to teor, verified using relay contact info 185.34.60.114:80 orport=443 id=7F7A695DF6F2B8640A70B6ADD01105BC2EBC5135

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018