diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-29 10:23:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-29 10:23:38 -0400 |
| commit | f3575a45cec35f3dee1bcef9237d5e63052405b5 (patch) | |
| tree | c12594ed520d1ad03f5606051993d5059c71bb0b /scripts | |
| parent | 1995328a3d0c98f5a8856f532b20099970afecc2 (diff) | |
| parent | 1c4a2dd208601aca9fdd004929c283b9d44d7442 (diff) | |
| download | tor-f3575a45cec35f3dee1bcef9237d5e63052405b5.tar.gz tor-f3575a45cec35f3dee1bcef9237d5e63052405b5.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/maint/fallback.blacklist | 3 | ||||
| -rw-r--r-- | scripts/maint/fallback.whitelist | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index d0bc214132..c9fd8a9236 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -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 diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index fb432ca67b..c801e46b15 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -335,9 +335,6 @@ 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 # Email sent directly to teor, verified using relay contact info |