Commit f3575a45 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.8'

parents 1995328a 1c4a2dd2

changes/bug19782

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (fallback directories):

    - Remove a fallback that was on the hardcoded list, then opted-out.

      Fixes bug 19782; update to fallback list from 0.2.8.2-alpha.

scripts/maint/fallback.blacklist

+3 −0
Original line number Diff line number Diff line
@@ -224,3 +224,6 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC 
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



# Fallback was on 0.2.8.2-alpha list, but opted-out before 0.2.8.6

37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D ipv6=[2001:41d0:a:195::1]:9001

scripts/maint/fallback.whitelist

+0 −3
Original line number Diff line number Diff line
@@ -334,9 +334,6 @@ 
# Email sent directly to teor, verified using relay contact info

195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197



# Email sent directly to teor, verified using relay contact info

37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D ipv6=[2001:41d0:a:195::1]:9001



# Email sent directly to teor, verified using relay contact info

62.210.238.33:9030 orport=9001 id=FDF845FC159C0020E2BDDA120C30C5C5038F74B4

src/or/fallback_dirs.inc

+5 −3
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay 
"5.9.110.236:9030 orport=9001 id=0756B7CD4DFC8182BE23143FAC0642F515182CEB"

" ipv6=[2a01:4f8:162:51e2::2]:9001"

" weight=10",

"37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D"

" ipv6=[2001:41d0:a:195::1]:9001"

" weight=10",

/* Fallback was on 0.2.8.2-alpha list, but opted-out before 0.2.8.6

 * "37.187.1.149:9030 orport=9001 id=08DC0F3C6E3D9C527C1FC8745D35DD1B0DE1875D"

 * " ipv6=[2001:41d0:a:195::1]:9001"

 * " weight=10",

 */

"5.39.92.199:80 orport=443 id=0BEA4A88D069753218EAAAD6D22EA87B9A1319D6"

" weight=10",

"5.196.88.122:9030 orport=9001 id=0C2C599AFCB26F5CFC2C7592435924C1D63D9484"