diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-28 19:15:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-28 19:15:43 -0400 |
| commit | f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b (patch) | |
| tree | 9ee397b0e2a56e7babd42b95079bc2d48ceaeae5 /scripts | |
| parent | d793a988cd9f3dca6b388857102ce7aabf7bbb9d (diff) | |
| parent | 2c9354fc1087c8b0bbfa7273106195e74540c731 (diff) | |
| download | tor-f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b.tar.gz tor-f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/maint/fallback.whitelist | 4 | ||||
| -rwxr-xr-x | scripts/maint/updateFallbackDirs.py | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 30db9492ae..fb432ca67b 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -638,7 +638,7 @@ 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC # Email sent directly to teor, verified using relay contact info -178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D +178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D # Email sent directly to teor, verified using relay contact info 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 ipv6=[2a01:4f8:a0:43eb::beef]:9001 @@ -658,7 +658,7 @@ # Email sent directly to teor, verified using relay contact info 96.47.231.214:9030 orport=8080 id=F843CB5729575D76FF1FFBB2179BDCF52C0C6387 192.99.246.48:9030 orport=9001 id=CD6B149BED1BB254EF6DFF9D75DDB11E7F8A38A4 ipv6=[2607:5300:100:200::de3]:9002 -192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F +192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F ipv6=[2605:e200:d00c:c01d::1111]:9002 # Email sent directly to teor, verified using relay contact info 136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664 diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index d17e702b6f..110ecda64c 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1828,20 +1828,25 @@ class CandidateList(dict): def summarise_fallbacks(self, eligible_count, operator_count, failed_count, guard_count, target_count): + s = '' + s += '/* To comment-out entries in this file, use C comments, and add *' + s += ' to the start of each line. (stem finds fallback entries using "' + s += ' at the start of a line.) */' + s += '\n' # Report: # whether we checked consensus download times # the number of fallback directories (and limits/exclusions, if relevant) # min & max fallback bandwidths # #error if below minimum count if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS: - s = '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%( + s += '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%( 'IPv4' if PERFORM_IPV4_DIRPORT_CHECKS else '', ' and ' if (PERFORM_IPV4_DIRPORT_CHECKS and PERFORM_IPV6_DIRPORT_CHECKS) else '', 'IPv6' if PERFORM_IPV6_DIRPORT_CHECKS else '', CONSENSUS_DOWNLOAD_SPEED_MAX) else: - s = '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */' + s += '/* Did not check IPv4 or IPv6 DirPort consensus downloads. */' s += '\n' # Multiline C comment with #error if things go bad s += '/*' |