Merge branch 'maint-0.2.8'

This commit is contained in:
Nick Mathewson
2016-07-29 10:23:38 -04:00
4 changed files with 11 additions and 6 deletions
+5 -3
View File
@@ -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"