commit 69635e41c819b45eb405bafaaa1bd9196e6446f3 Author: teor (Tim Wilson-Brown) <teor2345@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"