diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-23 09:30:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-23 09:30:48 -0400 |
| commit | 89e4126cd9cb438727756b0c577d3b08a4af6482 (patch) | |
| tree | 74590a7439f180c9ca7fe3d5535434cbad78a3b3 | |
| parent | 53d4c505cda3e129092366f863ce16a4ad192cfa (diff) | |
| parent | db6153e70c55cbe4569900d2c714d2f305f31f26 (diff) | |
| download | tor-89e4126cd9cb438727756b0c577d3b08a4af6482.tar.gz tor-89e4126cd9cb438727756b0c577d3b08a4af6482.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/broken-028-fallbacks | 3 | ||||
| -rw-r--r-- | src/or/fallback_dirs.inc | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/broken-028-fallbacks b/changes/broken-028-fallbacks new file mode 100644 index 0000000000..698fd6e37a --- /dev/null +++ b/changes/broken-028-fallbacks @@ -0,0 +1,3 @@ + o Minor feature (fallback directories): + - Remove broken fallbacks from the hard-coded fallback directory list. + Closes ticket 20190; patch by teor. diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index c4a2b13456..f6289199b7 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -113,8 +113,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "89.187.142.208:80 orport=443 id=64186650FFE4469EBBE52B644AE543864D32F43C" " weight=10", -"144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907" -" weight=10", +/* Fallback was on 0.2.8.6 list, but operator opted-out before 0.2.9 + * "144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907" + * " 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", |