[tor-commits] [tor/master] Remove a fallback that was on the hardcoded list, then opted-out

[nickm at torproject.org]

commit 1c4a2dd208601aca9fdd004929c283b9d44d7442
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Fri Jul 29 10:00:49 2016 +1000

    Remove a fallback that was on the hardcoded list, then opted-out
    
    The fallback was added in 0.2.8.2-alpha.
---
 changes/bug19782                 | 3 +++
 scripts/maint/fallback.blacklist | 3 +++
 scripts/maint/fallback.whitelist | 3 ---
 src/or/fallback_dirs.inc         | 8 +++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug19782 b/changes/bug19782
new file mode 100644
index 0000000..37660ea
--- /dev/null
+++ b/changes/bug19782
@@ -0,0 +1,3 @@
+  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.
diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist
index d0bc214..c9fd8a9 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 fb432ca..c801e46 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
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index e4959f2..245110f 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -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"