diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-02-18 23:03:35 +1100 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-02-27 10:04:00 +0100 |
| commit | e2202146d16af22502fd4166ac926fefa6528dff (patch) | |
| tree | d1e82eeadb00572cc7111319c7942fe9568b36f0 /scripts | |
| parent | a6017d61e18c4705637bd2c84425cfc2e3daa875 (diff) | |
| download | tor-e2202146d16af22502fd4166ac926fefa6528dff.tar.gz tor-e2202146d16af22502fd4166ac926fefa6528dff.zip | |
Update default fallback directories for 0.2.8.2-alpha (Feb 2016)
Allow fallback directories which have been stable for 7 days
to work around #18050, which causes relays to submit descriptors
with 0 DirPorts when restarted. (Particularly during Tor version
upgrades.)
Ignore low fallback directory count in alpha builds.
Set the target count to 50.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/maint/fallback.whitelist | 4 | ||||
| -rwxr-xr-x | scripts/maint/updateFallbackDirs.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index d5ddcd2e82..6edb368345 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -37,7 +37,6 @@ # https://lists.torproject.org/pipermail/tor-relays/2016-January/008555.html 62.210.124.124:9030 orport=9001 id=86E78DD3720C78DA8673182EF96C54B162CD660C ipv6=[2001:bc8:3f23:100::1]:9001 62.210.124.124:9130 orport=9101 id=2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E ipv6=[2001:bc8:3f23:100::1]:9101 -# DirPort TBC in next consensus 212.47.237.95:9030 orport=9001 id=3F5D8A879C58961BB45A3D26AC41B543B40236D6 212.47.237.95:9130 orport=9101 id=6FB38EB22E57EF7ED5EF00238F6A48E553735D88 @@ -76,7 +75,8 @@ 81.7.14.246:80 orport=443 id=CE75BF0972ADD52AF8807602374E495C815DB304 ipv6=[2a02:180:a:51::dead]:443 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008384.html -149.202.98.161:80 orport=443 id=54660C671B47E6986B465B80444414BD19E5A34B ipv6=[2001:41d0:8:4528::161]:443 +# Sent additional email to teor with fingerprint change +149.202.98.161:80 orport=443 id=FC64CD763F8C1A319BFBBF62551684F4E1E42332 ipv6=[2001:41d0:8:4528::161]:443 193.111.136.162:80 orport=443 id=C79552275DFCD486B942510EF663ED36ACA1A84B ipv6=[2001:4ba0:cafe:10d0::1]:443 # https://lists.torproject.org/pipermail/tor-relays/2015-December/008416.html diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 63aaeed267..d110335de4 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -79,7 +79,11 @@ MAX_LIST_FILE_SIZE = 1024 * 1024 ## Eligibility Settings -ADDRESS_AND_PORT_STABLE_DAYS = 120 +# Reduced due to a bug in tor where a relay submits a 0 DirPort when restarted +# This causes OnionOO to (correctly) reset its stability timer +# This issue is fixed in 0.2.7.7 and master. +# Until then, the CUTOFFs below ensure a decent level of stability. +ADDRESS_AND_PORT_STABLE_DAYS = 7 # What time-weighted-fraction of these flags must FallbackDirs # Equal or Exceed? CUTOFF_RUNNING = .95 @@ -109,7 +113,7 @@ FALLBACK_PROPORTION_OF_GUARDS = None if OUTPUT_CANDIDATES else 0.2 # Limit the number of fallbacks (eliminating lowest by weight) MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 500 # Emit a C #error if the number of fallbacks is below -MIN_FALLBACK_COUNT = 100 +MIN_FALLBACK_COUNT = 50 ## Fallback Weight Settings |