summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-20 19:29:17 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-20 19:29:17 -0400
commit06d99aa2c42de6013b3fa55ac03c661f57f90047 (patch)
tree465509b6e5a61f6fd0f2570a08136df775ea3ff3
parent32926b008b6c2a95966c6307ca4f1c920c920d44 (diff)
parent19a9872be2e91e367b85795186c29a077223e91e (diff)
downloadtor-06d99aa2c42de6013b3fa55ac03c661f57f90047.tar.gz
tor-06d99aa2c42de6013b3fa55ac03c661f57f90047.zip
Merge branch 'maint-0.2.8'
-rw-r--r--src/or/fallback_dirs.inc46
1 files changed, 30 insertions, 16 deletions
diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc
index 245110f4aa..c4a2b13456 100644
--- a/src/or/fallback_dirs.inc
+++ b/src/or/fallback_dirs.inc
@@ -30,9 +30,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
" weight=10",
"178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163"
" weight=10",
-"144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
-" ipv6=[2a01:4f8:190:9490::dead]:443"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but down for a week before 0.2.9
+ * "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB"
+ * " ipv6=[2a01:4f8:190:9490::dead]:443"
+ * " weight=10",
+ */
"178.32.216.146:9030 orport=9001 id=17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2"
" weight=10",
"46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8"
@@ -47,8 +49,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
* "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D"
* " weight=10",
*/
-"194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but went down before 0.2.9
+ * "194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C"
+ * " weight=10",
+ */
"144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510"
" weight=10",
"62.210.124.124:9130 orport=9101 id=2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E"
@@ -84,8 +88,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
"212.51.134.123:9030 orport=9001 id=50586E25BE067FD1F739998550EDDCB1A14CA5B2"
" ipv6=[2a02:168:6e00:0:3a60:77ff:fe9c:8bd1]:9001"
" weight=10",
-"5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9
+ * "5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33"
+ * " weight=10",
+ */
"94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69"
" weight=10",
"109.163.234.9:80 orport=443 id=5714542DCBEE1DD9864824723638FD44B2122CEA"
@@ -109,8 +115,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
" weight=10",
"144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907"
" weight=10",
-"94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but went down before 0.2.9
+ * "94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073"
+ * " weight=10",
+ */
"176.31.191.26:9030 orport=9001 id=7350AB9ED7568F22745198359373C04AC783C37C"
" weight=10",
"46.101.237.246:9030 orport=9001 id=75F1992FD3F403E9C082A5815EB5D12934CDF46C"
@@ -240,13 +248,17 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
" weight=10",
"5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8"
" weight=10",
-"195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but went down before 0.2.9
+ * "195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197"
+ * " weight=10",
+ */
"46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D"
" weight=10",
-"176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329"
-" ipv6=[2001:41d0:8:eb9d::1]:22"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but went down before 0.2.9
+ * "176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329"
+ * " ipv6=[2001:41d0:8:eb9d::1]:22"
+ * " weight=10",
+ */
"131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8"
" weight=10",
"91.219.236.222:80 orport=443 id=EC413181CEB1C8EDC17608BBB177CD5FD8535E99"
@@ -256,8 +268,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay
" weight=10",
"46.101.143.173:80 orport=443 id=F960DF50F0FD4075AC9B505C1D4FFC8384C490FB"
" weight=10",
-"195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64"
-" weight=10",
+/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9
+ * "195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64"
+ * " weight=10",
+ */
"192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC"
" weight=10",
"193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07"