June 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Update the fallback whitelist and blacklist
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 0a79e92914579afabeef0d5d32d6db44ead2804e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 21:37:19 2016 +1000 Update the fallback whitelist and blacklist Operators have sent emails asking to have their relays added or removed from the fallback list. Since none of the blacklisted relays are in the hard-coded falback list, it does not need to be changed. --- scripts/maint/fallback.blacklist | 22 +++++++++++++----- scripts/maint/fallback.whitelist | 48 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index cc0c55d..8ce2edd 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -57,11 +57,6 @@ 65.19.167.133:80 orport=443 id=C170AE5A886C5A09D6D1CF5CF284653632EEF25D # Email sent directly to teor, verified using relay contact info -195.154.165.227:80 orport=443 id=C08DE49658E5B3CFC6F2A952B453C4B608C9A16A -62.210.69.34:80 orport=443 id=71AB4726D830FAE776D74AEF790CF04D8E0151B4 -163.172.13.124:80 orport=443 id=B771AA877687F88E6F1CA5354756DF6C8A7B6B24 - -# Email sent directly to teor, verified using relay contact info 213.136.83.225:80 orport=443 id=B411027C926A9BFFCF7DA91E3CAF1856A321EFFD 195.154.126.78:80 orport=443 id=F6556156E2B3837248E03FDB770441CF64DBBFBE @@ -73,7 +68,6 @@ 185.75.56.103:80 orport=9001 id=3763CE5C3F574670D4296573744F821C0FFFB98E # Email sent directly to teor, verified using relay contact info -108.166.168.158:80 orport=443 id=CDAB3AE06A8C9C6BF817B3B0F1877A4B91465699 81.7.14.227:9030 orport=9001 id=BCA197C43A44B7B9D14509637F96A45B13C233D0 # Email sent directly to teor, verified using relay contact info @@ -195,3 +189,19 @@ 176.10.99.208:3307 orport=3306 id=1F0D2A44C56F42816DED2022EFD631878C29905B 176.10.99.209:1434 orport=1433 id=BDA7A91FF3806DE5109FDAE74CFEFB3BABB9E10F 176.10.99.209:220 orport=219 id=B8C2030001D832066A648269CFBA94171951D34B + +# Email sent directly to teor, verified using relay contact info +78.193.40.205:8080 orport=8443 id=C91450840E75AC1B654A3096744338A573A239C6 + +# Email sent directly to teor, verified using relay contact info +37.187.22.172:9030 orport=9035 id=335E4117BD9A4966403C2AFA31CFDD1BC13BD46A + +# https://lists.torproject.org/pipermail/tor-relays/2015-December/008367.html +# Email sent directly to teor to opt-out +88.198.38.226:22 orport=443 id=4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB ipv6=[2a01:4f8:a0:1351::2]:80 +213.239.210.204:22 orport=443 id=5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 ipv6=[2a01:4f8:a0:9474::2]:80 +213.239.220.25:22 orport=443 id=BEE2317AE127EB681C5AE1551C1EA0630580638A ipv6=[2a01:4f8:a0:710c::2]:80 +85.10.201.38:22 orport=443 id=F6279A203C1950ACF592322A235647A05BFBCF91 ipv6=[2a01:4f8:a0:43cc::2]:80 + +# Email sent directly to teor, verified using relay contact info +88.190.208.4:30555 orport=30556 id=030A6EB24725C05D8E0FCE21923CBA5223E75E0E diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index ce45f0d..7c47d3e 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -41,13 +41,6 @@ # https://lists.torproject.org/pipermail/tor-relays/2015-December/008366.html 5.39.88.19:9030 orport=9001 id=7CB8C31432A796731EA7B6BF4025548DFEB25E0C ipv6=[2001:41d0:8:9a13::1]:9050 -# https://lists.torproject.org/pipermail/tor-relays/2015-December/008367.html -# Email sent directly to teor with intended DirPort settings -88.198.38.226:22 orport=443 id=4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB ipv6=[2a01:4f8:a0:1351::2]:80 -213.239.210.204:22 orport=443 id=5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 ipv6=[2a01:4f8:a0:9474::2]:80 -213.239.220.25:22 orport=443 id=BEE2317AE127EB681C5AE1551C1EA0630580638A ipv6=[2a01:4f8:a0:710c::2]:80 -85.10.201.38:22 orport=443 id=F6279A203C1950ACF592322A235647A05BFBCF91 ipv6=[2a01:4f8:a0:43cc::2]:80 - # https://lists.torproject.org/pipermail/tor-relays/2015-December/008370.html # https://lists.torproject.org/pipermail/tor-relays/2016-January/008517.html # https://lists.torproject.org/pipermail/tor-relays/2016-January/008555.html @@ -70,8 +63,8 @@ 144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB ipv6=[2a01:4f8:190:9490::dead]:443 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008379.html -# changed to 91.121.84.137? Awaiting operator confirmation -#85.25.138.93:9030 orport=4029 id=6DE61A6F72C1E5418A66BFED80DFB63E4C77668F +# Email sent directly to teor, verified using relay contact info +91.121.84.137:4951 orport=4051 id=6DE61A6F72C1E5418A66BFED80DFB63E4C77668F # https://lists.torproject.org/pipermail/tor-relays/2015-December/008380.html 5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 @@ -496,9 +489,6 @@ 93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F # Email sent directly to teor, verified using relay contact info -37.187.22.172:9030 orport=9035 id=335E4117BD9A4966403C2AFA31CFDD1BC13BD46A - -# Email sent directly to teor, verified using relay contact info 37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A # Email sent directly to teor, verified using relay contact info @@ -545,9 +535,6 @@ 83.212.99.68:80 orport=443 id=DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0 ipv6=[2001:648:2ffc:1225:a800:bff:fe3d:67b5]:443 # Email sent directly to teor, verified using relay contact info -51.254.101.242:32991 orport=9001 id=4CC9CC9195EC38645B699A33307058624F660CCF - -# Email sent directly to teor, verified using relay contact info 95.130.11.147:9030 orport=443 id=6B697F3FF04C26123466A5C0E5D1F8D91925967A # Email sent directly to teor, verified using relay contact info @@ -557,15 +544,9 @@ 128.199.55.207:9030 orport=9001 id=BCEF908195805E03E92CCFE669C48738E556B9C5 ipv6=[2a03:b0c0:2:d0::158:3001]:9001 # Email sent directly to teor, verified using relay contact info -88.190.208.4:30555 orport=30556 id=030A6EB24725C05D8E0FCE21923CBA5223E75E0E - -# Email sent directly to teor, verified using relay contact info 178.32.216.146:9030 orport=9001 id=17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2 # Email sent directly to teor, verified using relay contact info -78.193.40.205:8080 orport=8443 id=C91450840E75AC1B654A3096744338A573A239C6 - -# Email sent directly to teor, verified using relay contact info 212.83.40.238:9030 orport=9001 id=F409FA7902FD89270E8DE0D7977EA23BC38E5887 # Email sent directly to teor, verified using relay contact info @@ -655,7 +636,7 @@ 91.233.106.121:80 orport=443 id=896364B7996F5DFBA0E15D1A2E06D0B98B555DD6 # Email sent directly to teor, verified using relay contact info -167.114.113.48:80 orport=443 id=2EC0C66EA700C44670444280AABAB1EC78B722A0 +167.114.113.48:9030 orport=443 id=2EC0C66EA700C44670444280AABAB1EC78B722A0 # Email sent directly to teor, verified using relay contact info 79.120.16.42:9030 orport=9001 id=BD552C165E2ED2887D3F1CCE9CFF155DDA2D86E6 @@ -783,3 +764,26 @@ # Email sent directly to teor, verified using relay contact info 192.99.212.139:80 orport=443 id=F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC + +# Email sent directly to teor, verified using relay contact info +163.172.35.249:80 orport=443 id=C08DE49658E5B3CFC6F2A952B453C4B608C9A16A +163.172.35.247:80 orport=443 id=71AB4726D830FAE776D74AEF790CF04D8E0151B4 +163.172.13.124:80 orport=443 id=B771AA877687F88E6F1CA5354756DF6C8A7B6B24 + +# Email sent directly to teor, verified using relay contact info +64.113.32.29:9030 orport=9001 id=30C19B81981F450C402306E2E7CFB6C3F79CB6B2 + +# Email sent directly to teor, verified using relay contact info +212.51.156.193:995 orport=110 id=32E7AAF1F602814D699BEF6761AD03E387758D49 ipv6=[2a02:168:4a01::49]:110 + +# Emails sent directly to teor, verified using relay contact info +51.254.101.242:9002 orport=9001 id=4CC9CC9195EC38645B699A33307058624F660CCF + +# Emails sent directly to teor, verified using relay contact info +85.214.62.48:80 orport=443 id=6A7551EEE18F78A9813096E82BF84F740D32B911 + +# Email sent directly to teor, verified using relay contact info +173.255.245.116:9030 orport=9001 id=91E4015E1F82DAF0121D62267E54A1F661AB6DC7 + +# Email sent directly to teor, verified using relay contact info +62.216.5.120:9030 orport=9001 id=D032D4D617140D6B828FC7C4334860E45E414FBE

1 0

[tor/master] Remove 2 fallbacks: one lost guard, the other had bad uptime
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit b15cecd4f88729ae6a651d1c8c39caf0592c2752 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 11:33:00 2016 +1000 Remove 2 fallbacks: one lost guard, the other had bad uptime Leave these fallbacks in the whitelist, they may improve before 0.2.9. --- src/or/fallback_dirs.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 5934f48..22f65f0 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -164,9 +164,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but had low uptime before 0.2.8.5 "195.154.164.243:80 orport=443 id=AC66FFA4AB35A59EBBF5BF4C70008BF24D8A7A5C" " ipv6=[2001:bc8:399f:f000::1]:993" " weight=10", +*/ "86.59.119.88:80 orport=443 id=ACD889D86E02EDDAB1AFD81F598C0936238DC6D0" " weight=10", "163.172.131.88:80 orport=443 id=AD253B49E303C6AB1E048B014392AC569E8A7DAE" @@ -214,8 +216,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but lost Guard flag before 0.2.8.5 "185.14.185.240:9030 orport=443 id=D62FB817B0288085FAC38A6DC8B36DCD85B70260" " weight=10", +*/ "37.221.162.226:9030 orport=9001 id=D64366987CB39F61AD21DBCF8142FA0577B92811" " weight=10", "193.35.52.53:9030 orport=9001 id=DAA39FC00B196B353C2A271459C305C429AF09E4"

1 0

[tor/master] Document how to test the hard-coded fallback list
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 6ce53668f4d043fbc4662ac381823adea8d0ab24 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 09:16:29 2016 +1000 Document how to test the hard-coded fallback list --- scripts/maint/fallback.whitelist | 15 +++++++++++++++ scripts/maint/updateFallbackDirs.py | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 06456c6..ce45f0d 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -8,6 +8,21 @@ # it, and vice versa, otherwise they don't match. # (The blacklist overrides the whitelist.) +# To replace this list with the hard-coded fallback list (for testing), use +# a command similar to: +# cat src/or/fallback_dirs.inc | grep \" | grep -v weight | tr -d '\n' | \ +# sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ +# > scripts/maint/fallback.whitelist +# +# When testing before a release, exclusions due to changed details will result +# in a warning, unless the IPv4 address or port change happened recently. +# Then it is only logged at info level, as part of the eligibility check. +# Exclusions due to stability also are only shown at info level. +# +# Add the number of selected, slow, and excluded relays, and compare that to +# the number of hard-coded relays. If it's less, use info-level logs to find +# out why each of the missing relays was excluded. + # If a relay operator wants their relay to be a FallbackDir, # enter the following information here: # <IPv4>:<DirPort> orport=<ORPort> id=<ID> [ ipv6=<IPv6>:<IPv6 ORPort> ] diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 464d847..7fcb365 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1909,6 +1909,10 @@ def list_fallbacks(): prefilter_fallbacks = copy.copy(candidates.fallbacks) # filter with the whitelist and blacklist + # if a relay has changed IPv4 address or ports recently, it will be excluded + # as ineligible before we call apply_filter_lists, and so there will be no + # warning that the details have changed from those in the whitelist. + # instead, there will be an info-level log during the eligibility check. initial_count = len(candidates.fallbacks) excluded_count = candidates.apply_filter_lists() print candidates.summarise_filters(initial_count, excluded_count)

1 0

[tor/maint-0.2.8] Remove and blacklist 4 fallbacks which are unsuitable
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 7e9532b9be9b7e68fba14cd4c3f1132fde90bac9 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 09:59:05 2016 +1000 Remove and blacklist 4 fallbacks which are unsuitable Remove a fallback that changed its fingerprint after it was listed This happened after to a software update: https://lists.torproject.org/pipermail/tor-relays/2016-June/009473.html Remove a fallback that changed IPv4 address Remove two fallbacks that were slow to deliver consensuses, we can't guarantee they'll be fast in future. Blacklist all these fallbacks until operators confirm they're stable. --- scripts/maint/fallback.blacklist | 14 ++++++++++++++ scripts/maint/fallback.whitelist | 8 -------- src/or/fallback_dirs.inc | 8 ++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index 8ce2edd..cd934ca 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -205,3 +205,17 @@ # Email sent directly to teor, verified using relay contact info 88.190.208.4:30555 orport=30556 id=030A6EB24725C05D8E0FCE21923CBA5223E75E0E + +# Fallback was on 0.2.8.2-alpha list, but changed fingerprint before 0.2.8.5 +46.101.102.71:80 orport=443 id=9504CB22EEB25D344DE63CB7A6F2C46F895C3686 ipv6=[2a03:b0c0:3:d0::2ed:7001]:9050 +# Also blacklist anything with the new fingerprint +id=9C8A123081EFBE022EF795630F447839DDFDDDEC + +# Fallbacks were on 0.2.8.2-alpha list, but downloads were slow before 0.2.8.5 +185.96.88.29:80 orport=443 id=86C281AD135058238D7A337D546C902BE8505DDE +178.62.36.64:9030 orport=9001 id=B87C84E38DAECFFFFDE98E5AEE5786AFDC748F2C + +# Fallback was on 0.2.8.2-alpha list, but changed address before 0.2.8.5 +84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34 +# Also blacklist anything with the new address +84.216.235.55:9030 orport=443 diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 7c47d3e..21ec22a 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -31,9 +31,6 @@ 78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE 131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 -# https://lists.torproject.org/pipermail/tor-relays/2015-December/008363.html -84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34 - # https://lists.torproject.org/pipermail/tor-relays/2015-December/008365.html # Email sent directly to teor with fingerprint update 81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443 @@ -131,7 +128,6 @@ # Email sent directly to teor, verified using relay contact info 85.235.250.88:80 orport=443 id=72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE -185.96.88.29:80 orport=443 id=86C281AD135058238D7A337D546C902BE8505DDE 185.96.180.29:80 orport=443 id=F93D8F37E35C390BCAD9F9069E13085B745EC216 # Email sent directly to teor, verified using relay contact info @@ -286,7 +282,6 @@ # Email sent directly to teor, verified using relay contact info 178.62.22.36:80 orport=443 id=A0766C0D3A667A3232C7D569DE94A28F9922FCB1 ipv6=[2a03:b0c0:1:d0::174:1]:9050 -46.101.102.71:80 orport=443 id=9504CB22EEB25D344DE63CB7A6F2C46F895C3686 ipv6=[2a03:b0c0:3:d0::2ed:7001]:9050 188.166.23.127:80 orport=443 id=3771A8154DEA98D551607806C80A209CDAA74535 ipv6=[2a03:b0c0:2:d0::27b:7001]:9050 198.199.64.217:80 orport=443 id=FAD306BAA59F6A02783F8606BDAA431F5FF7D1EA ipv6=[2604:a880:400:d0::1a9:b001]:9050 159.203.32.149:80 orport=443 id=55C7554AFCEC1062DCBAC93E67B2E03C6F330EFC ipv6=[2604:a880:cad:d0::105:f001]:9050 @@ -338,9 +333,6 @@ 46.148.18.74:8080 orport=443 id=6CACF0B5F03C779672F3C5C295F37C8D234CA3F7 # Email sent directly to teor, verified using relay contact info -178.62.36.64:9030 orport=9001 id=B87C84E38DAECFFFFDE98E5AEE5786AFDC748F2C - -# Email sent directly to teor, verified using relay contact info 37.187.102.108:9090 orport=5550 id=F4263275CF54A6836EE7BD527B1328836A6F06E1 212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 8e82a3f..5934f48 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -120,12 +120,16 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "192.87.28.82:9030 orport=9001 id=844AE9CAD04325E955E2BE1521563B79FE7094B7" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but changed address before 0.2.8.5 "84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34" " weight=10", +*/ "163.172.138.22:80 orport=443 id=8664DC892540F3C789DB37008236C096C871734D" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but downloads were slow before 0.2.8.5 "185.96.88.29:80 orport=443 id=86C281AD135058238D7A337D546C902BE8505DDE" " weight=10", +*/ "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" " weight=10", "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D" @@ -140,9 +144,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "91.219.237.244:80 orport=443 id=92ECC9E0E2AF81BB954719B189AC362E254AD4A5" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but changed fingerprint before 0.2.8.5 "46.101.102.71:80 orport=443 id=9504CB22EEB25D344DE63CB7A6F2C46F895C3686" " ipv6=[2a03:b0c0:3:d0::2ed:7001]:9050" " weight=10", +*/ "85.214.206.219:9030 orport=9001 id=98F8D5F359949E41DE8DF3DBB1975A86E96A84A0" " weight=10", "81.7.10.93:31336 orport=31337 id=99E246DB480B313A3012BC3363093CC26CD209C7" @@ -177,8 +183,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but downloads were slow before 0.2.8.5 "178.62.36.64:9030 orport=9001 id=B87C84E38DAECFFFFDE98E5AEE5786AFDC748F2C" " weight=10", +*/ "197.231.221.211:9030 orport=9001 id=BC630CBBB518BE7E9F4E09712AB0269E9DC7D626" " weight=10", "198.96.155.3:8080 orport=5001 id=BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E"

1 0

[tor/release-0.2.8] Remove and blacklist 3 fallbacks which disappeared
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 69635e41c819b45eb405bafaaa1bd9196e6446f3 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 12:09:32 2016 +1000 Remove and blacklist 3 fallbacks which disappeared Blacklist them in case they appear again. --- scripts/maint/fallback.blacklist | 5 +++++ scripts/maint/fallback.whitelist | 8 -------- src/or/fallback_dirs.inc | 6 ++++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index cd934ca..d0bc214 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -219,3 +219,8 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC 84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34 # Also blacklist anything with the new address 84.216.235.55:9030 orport=443 + +# Fallbacks were on 0.2.8.2-alpha list, but disappeared before 0.2.8.5 +81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443 +51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D +185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859 diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 21ec22a..30db949 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -31,10 +31,6 @@ 78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE 131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 -# https://lists.torproject.org/pipermail/tor-relays/2015-December/008365.html -# Email sent directly to teor with fingerprint update -81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443 - # https://lists.torproject.org/pipermail/tor-relays/2015-December/008366.html 5.39.88.19:9030 orport=9001 id=7CB8C31432A796731EA7B6BF4025548DFEB25E0C ipv6=[2001:41d0:8:9a13::1]:9050 @@ -309,7 +305,6 @@ # Email sent directly to teor, verified using relay contact info 192.99.55.69:80 orport=443 id=0682DE15222A4A4A0D67DBA72A8132161992C023 -51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D 192.99.59.140:80 orport=443 id=3C9148DA49F20654730FAC83FFF693A4D49D0244 51.254.215.13:80 orport=443 id=73C30C8ABDD6D9346C822966DE73B9F82CB6178A 51.254.215.129:80 orport=443 id=7B4491D05144B20AE8519AE784B94F0525A8BB79 @@ -708,9 +703,6 @@ 198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92 # Email sent directly to teor, verified using relay contact info -185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859 - -# Email sent directly to teor, verified using relay contact info 167.114.66.61:9696 orport=443 id=DE6CD5F09DF26076F26321B0BDFBE78ACD935C65 ipv6=[2607:5300:100::78d]:443 # Email sent directly to teor, verified using relay contact info diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 22f65f0..58c67c0 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -40,8 +40,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D" " weight=10", +*/ "194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" " weight=10", "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" @@ -90,8 +92,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859" " weight=10", +*/ "178.16.208.62:80 orport=443 id=5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B" " ipv6=[2a00:1c20:4089:1234:a6a4:2926:d0af:dfee]:443" " weight=10", @@ -207,9 +211,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay "178.62.199.226:80 orport=443 id=CBEFF7BA4A4062045133C053F2D70524D8BBE5BE" " ipv6=[2a03:b0c0:2:d0::b7:5001]:443" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820" " ipv6=[2a02:180:1:1::517:11ab]:443" " weight=10", +*/ "134.119.3.164:9030 orport=9001 id=D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE" " weight=10", "185.13.38.75:9030 orport=9001 id=D2A1703758A0FBBA026988B92C2F88BAB59F9361"

1 0

[tor/release-0.2.8] Changes file for 19071 and 19480
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 421a7c8c35064993cf4ce344e4b0fab06e7df3a4 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 12:37:59 2016 +1000 Changes file for 19071 and 19480 --- changes/ticket19071-19480 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/changes/ticket19071-19480 b/changes/ticket19071-19480 new file mode 100644 index 0000000..3366f82 --- /dev/null +++ b/changes/ticket19071-19480 @@ -0,0 +1,10 @@ + o Minor bugfixes (fallback directory selection): + - Avoid errors during fallback selection if there are no eligible + fallbacks. Fixes bug 19480; bugfix on ba76910 and 78ec782 in + 0.2.8.3-alpha. Patch by teor. + o Minor features (fallback directory list): + - Update hard-coded fallback list to remove unsuitable fallbacks. + Resolves ticket 19071. Patch by teor. + - Update fallback whitelist and blacklist based on relay operator + emails. Blacklist unsuitable fallbacks. Resolves ticket 19071. + Patch by teor.

1 0

[tor/release-0.2.8] Document how to test the hard-coded fallback list
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 6ce53668f4d043fbc4662ac381823adea8d0ab24 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 09:16:29 2016 +1000 Document how to test the hard-coded fallback list --- scripts/maint/fallback.whitelist | 15 +++++++++++++++ scripts/maint/updateFallbackDirs.py | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 06456c6..ce45f0d 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -8,6 +8,21 @@ # it, and vice versa, otherwise they don't match. # (The blacklist overrides the whitelist.) +# To replace this list with the hard-coded fallback list (for testing), use +# a command similar to: +# cat src/or/fallback_dirs.inc | grep \" | grep -v weight | tr -d '\n' | \ +# sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ +# > scripts/maint/fallback.whitelist +# +# When testing before a release, exclusions due to changed details will result +# in a warning, unless the IPv4 address or port change happened recently. +# Then it is only logged at info level, as part of the eligibility check. +# Exclusions due to stability also are only shown at info level. +# +# Add the number of selected, slow, and excluded relays, and compare that to +# the number of hard-coded relays. If it's less, use info-level logs to find +# out why each of the missing relays was excluded. + # If a relay operator wants their relay to be a FallbackDir, # enter the following information here: # <IPv4>:<DirPort> orport=<ORPort> id=<ID> [ ipv6=<IPv6>:<IPv6 ORPort> ] diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 464d847..7fcb365 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1909,6 +1909,10 @@ def list_fallbacks(): prefilter_fallbacks = copy.copy(candidates.fallbacks) # filter with the whitelist and blacklist + # if a relay has changed IPv4 address or ports recently, it will be excluded + # as ineligible before we call apply_filter_lists, and so there will be no + # warning that the details have changed from those in the whitelist. + # instead, there will be an info-level log during the eligibility check. initial_count = len(candidates.fallbacks) excluded_count = candidates.apply_filter_lists() print candidates.summarise_filters(initial_count, excluded_count)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 61dac57aa3790464dd50da9bbc78fd275f511f3d Merge: cb8557f 421a7c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 22 08:20:11 2016 -0400 Merge branch 'maint-0.2.8' changes/ticket19071-19480 | 10 +++++ scripts/maint/fallback.blacklist | 41 ++++++++++++++++--- scripts/maint/fallback.whitelist | 79 +++++++++++++++++++------------------ scripts/maint/updateFallbackDirs.py | 16 +++++++- src/or/fallback_dirs.inc | 18 +++++++++ 5 files changed, 118 insertions(+), 46 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit cc6fcbde4ea11ef66a9e0c3fe62d007491f8cb22 Merge: cf13189 421a7c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 22 08:19:51 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/ticket19071-19480 | 10 +++++ scripts/maint/fallback.blacklist | 41 ++++++++++++++++--- scripts/maint/fallback.whitelist | 79 +++++++++++++++++++------------------ scripts/maint/updateFallbackDirs.py | 16 +++++++- src/or/fallback_dirs.inc | 18 +++++++++ 5 files changed, 118 insertions(+), 46 deletions(-)

1 0

[tor/master] Remove and blacklist 3 fallbacks which disappeared
by nickm＠torproject.org 22 Jun '16

22 Jun '16

commit 69635e41c819b45eb405bafaaa1bd9196e6446f3 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 22 12:09:32 2016 +1000 Remove and blacklist 3 fallbacks which disappeared Blacklist them in case they appear again. --- scripts/maint/fallback.blacklist | 5 +++++ scripts/maint/fallback.whitelist | 8 -------- src/or/fallback_dirs.inc | 6 ++++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index cd934ca..d0bc214 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -219,3 +219,8 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC 84.219.173.60:9030 orport=443 id=855BC2DABE24C861CD887DB9B2E950424B49FC34 # Also blacklist anything with the new address 84.216.235.55:9030 orport=443 + +# Fallbacks were on 0.2.8.2-alpha list, but disappeared before 0.2.8.5 +81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443 +51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D +185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859 diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 21ec22a..30db949 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -31,10 +31,6 @@ 78.47.18.110:443 orport=80 id=F8D27B163B9247B232A2EEE68DD8B698695C28DE 131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8 -# https://lists.torproject.org/pipermail/tor-relays/2015-December/008365.html -# Email sent directly to teor with fingerprint update -81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820 ipv6=[2a02:180:1:1::517:11ab]:443 - # https://lists.torproject.org/pipermail/tor-relays/2015-December/008366.html 5.39.88.19:9030 orport=9001 id=7CB8C31432A796731EA7B6BF4025548DFEB25E0C ipv6=[2001:41d0:8:9a13::1]:9050 @@ -309,7 +305,6 @@ # Email sent directly to teor, verified using relay contact info 192.99.55.69:80 orport=443 id=0682DE15222A4A4A0D67DBA72A8132161992C023 -51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D 192.99.59.140:80 orport=443 id=3C9148DA49F20654730FAC83FFF693A4D49D0244 51.254.215.13:80 orport=443 id=73C30C8ABDD6D9346C822966DE73B9F82CB6178A 51.254.215.129:80 orport=443 id=7B4491D05144B20AE8519AE784B94F0525A8BB79 @@ -708,9 +703,6 @@ 198.50.191.95:80 orport=443 id=39F096961ED2576975C866D450373A9913AFDC92 # Email sent directly to teor, verified using relay contact info -185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859 - -# Email sent directly to teor, verified using relay contact info 167.114.66.61:9696 orport=443 id=DE6CD5F09DF26076F26321B0BDFBE78ACD935C65 ipv6=[2607:5300:100::78d]:443 # Email sent directly to teor, verified using relay contact info diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 22f65f0..58c67c0 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -40,8 +40,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "185.61.138.18:8080 orport=4443 id=2541759BEC04D37811C2209A88E863320271EC9C" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D" " weight=10", +*/ "194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" " weight=10", "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" @@ -90,8 +92,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "78.142.142.246:80 orport=443 id=5A5E03355C1908EBF424CAF1F3ED70782C0D2F74" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "185.100.85.138:80 orport=46356 id=5C4DF16A0029CC4F67D3E127356E68F219269859" " weight=10", +*/ "178.16.208.62:80 orport=443 id=5CF8AFA5E4B0BB88942A44A3F3AAE08C3BDFD60B" " ipv6=[2a00:1c20:4089:1234:a6a4:2926:d0af:dfee]:443" " weight=10", @@ -207,9 +211,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay "178.62.199.226:80 orport=443 id=CBEFF7BA4A4062045133C053F2D70524D8BBE5BE" " ipv6=[2a03:b0c0:2:d0::b7:5001]:443" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but went down before 0.2.8.5 "81.7.17.171:80 orport=443 id=CFECDDCA990E3EF7B7EC958B22441386B6B8D820" " ipv6=[2a02:180:1:1::517:11ab]:443" " weight=10", +*/ "134.119.3.164:9030 orport=9001 id=D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE" " weight=10", "185.13.38.75:9030 orport=9001 id=D2A1703758A0FBBA026988B92C2F88BAB59F9361"

1 0