tor-commits December 2016

tor-commits@lists.torproject.org

18 participants
2010 discussions

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 4be5ca1858e231d6c6734a2acaad91b923ea790a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 03:45:21 2016 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index dd98b97..cf56ea5 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -1,7 +1,7 @@ https-everywhere.menu.globalEnable = 啟用 HTTPS Everywhere https-everywhere.menu.globalDisable = 停用 HTTPS Everywhere https-everywhere.menu.enableDisable = 啟用 / 停用規則 -https-everywhere.menu.noRules = (沒有規則適用於此網頁) +https-everywhere.menu.noRules = (沒有適用於此網頁的規則) https-everywhere.menu.unknownRules = (適用此網頁的規則不明) https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。 https-everywhere.migration.notification0 = 為了實現關鍵性的修正，此更新將您的 HTTPS Everywhere 規則偏好設定重設為預設值。

1 0

[sandboxed-tor-browser/master] fixup! Set the security slider to "High" by default on a fresh install.
by yawning＠torproject.org 21 Dec '16

21 Dec '16

commit dc12dd1503922f6a7538df58b4d8c8a836907d3c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Dec 21 02:59:49 2016 +0000 fixup! Set the security slider to "High" by default on a fresh install. --- data/installer/mozilla.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg index 1a63f7e..4322906 100644 --- a/data/installer/mozilla.cfg +++ b/data/installer/mozilla.cfg @@ -18,4 +18,4 @@ lockPref("extensions.update.enabled", false); lockPref("extensions.update.autoUpdateDefault", false); // Set the security slider to "High" by default. -pref("extensions.torbutton.security_slider", 1); +defaultPref("extensions.torbutton.security_slider", 1);

1 0

[tor/master] Provide bandwidth and consensus weight for each candidate fallback
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 4eba30ca59a8c6fed7ddd4135d9788082b11d3c2 Author: teor <teor2345(a)gmail.com> Date: Thu Sep 22 07:59:09 2016 +1000 Provide bandwidth and consensus weight for each candidate fallback And make it clear that updateFallbackDirs.py outputs bandwidth in megabytes per second. Closes #20878. --- scripts/maint/updateFallbackDirs.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 094cbd8..e28185f 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -80,7 +80,7 @@ PERFORM_IPV4_DIRPORT_CHECKS = False if OUTPUT_CANDIDATES else True # Don't check ~1000 candidates when OUTPUT_CANDIDATES is True PERFORM_IPV6_DIRPORT_CHECKS = False if OUTPUT_CANDIDATES else False -# Output fallback name, flags, and ContactInfo in a C comment? +# Output fallback name, flags, bandwidth, and ContactInfo in a C comment? OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False # Output matching ContactInfo in fallbacks list or the blacklist? @@ -173,7 +173,7 @@ EXIT_BANDWIDTH_FRACTION = 1.0 # If a single fallback's bandwidth is too low, it's pointless adding it # We expect fallbacks to handle an extra 30 kilobytes per second of traffic # Make sure they can support a hundred times the expected extra load -# (Use 102.4 to make it come out nicely in MB/s) +# (Use 102.4 to make it come out nicely in MByte/s) # We convert this to a consensus weight before applying the filter, # because all the bandwidth amounts are specified by the relay MIN_BANDWIDTH = 102.4 * 30.0 * 1024.0 @@ -1151,6 +1151,7 @@ class Candidate(object): # /* # nickname # flags + # adjusted bandwidth, consensus weight # [contact] # [identical contact counts] # */ @@ -1162,6 +1163,13 @@ class Candidate(object): s += 'Flags: ' s += cleanse_c_multiline_comment(' '.join(sorted(self._data['flags']))) s += '\n' + # this is an adjusted bandwidth, see calculate_measured_bandwidth() + bandwidth = self._data['measured_bandwidth'] + weight = self._data['consensus_weight'] + s += 'Bandwidth: %.1f MByte/s, Consensus Weight: %d'%( + bandwidth/(1024.0*1024.0), + weight) + s += '\n' if self._data['contact'] is not None: s += cleanse_c_multiline_comment(self._data['contact']) if CONTACT_COUNT or CONTACT_BLACKLIST_COUNT: @@ -1430,8 +1438,8 @@ class CandidateList(dict): # the bandwidth we log here is limited by the relay's consensus weight # as well as its adverttised bandwidth. See set_measured_bandwidth # for details - logging.info('%s not a candidate: bandwidth %.1fMB/s too low, must ' + - 'be at least %.1fMB/s', f._fpr, + logging.info('%s not a candidate: bandwidth %.1fMByte/s too low, ' + + 'must be at least %.1fMByte/s', f._fpr, f._data['measured_bandwidth']/(1024.0*1024.0), MIN_BANDWIDTH/(1024.0*1024.0)) self.fallbacks = above_min_bw_fallbacks @@ -1879,8 +1887,8 @@ class CandidateList(dict): min_bw = min_fb._data['measured_bandwidth'] max_fb = self.fallback_max() max_bw = max_fb._data['measured_bandwidth'] - s += 'Bandwidth Range: %.1f - %.1f MB/s'%(min_bw/(1024.0*1024.0), - max_bw/(1024.0*1024.0)) + s += 'Bandwidth Range: %.1f - %.1f MByte/s'%(min_bw/(1024.0*1024.0), + max_bw/(1024.0*1024.0)) s += '\n' s += '*/' if fallback_count < MIN_FALLBACK_COUNT:

1 0

[tor/master] Exclude relay versions affected by #20499 from the fallback list
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 243d6fa0c757b5ca379439f8363d2db053c778e6 Author: teor <teor2345(a)gmail.com> Date: Tue Dec 6 22:01:14 2016 +1100 Exclude relay versions affected by #20499 from the fallback list Part of #20539, based on #20509. --- scripts/maint/updateFallbackDirs.py | 65 ++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 826db6e..0dfe0af 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -501,6 +501,8 @@ class Candidate(object): if (not 'effective_family' in details or details['effective_family'] is None): details['effective_family'] = [] + if not 'platform' in details: + details['platform'] = None details['last_changed_address_or_port'] = parse_ts( details['last_changed_address_or_port']) self._data = details @@ -515,6 +517,7 @@ class Candidate(object): self._compute_ipv6addr() if not self.has_ipv6(): logging.debug("Failed to get an ipv6 address for %s."%(self._fpr,)) + self._compute_version() def _stable_sort_or_addresses(self): # replace self._data['or_addresses'] with a stable ordering, @@ -627,6 +630,59 @@ class Candidate(object): self.ipv6orport = int(port) return + def _compute_version(self): + # parse the version out of the platform string + # The platform looks like: "Tor 0.2.7.6 on Linux" + self._data['version'] = None + if self._data['platform'] is None: + return + # be tolerant of weird whitespacing, use a whitespace split + tokens = self._data['platform'].split() + for token in tokens: + vnums = token.split('.') + # if it's at least a.b.c.d, with potentially an -alpha-dev, -alpha, -rc + if (len(vnums) >= 4 and vnums[0].isdigit() and vnums[1].isdigit() and + vnums[2].isdigit()): + self._data['version'] = token + return + + # From #20509 + # bug #20499 affects versions from 0.2.9.1-alpha-dev to 0.2.9.4-alpha-dev + # and version 0.3.0.0-alpha-dev + # Exhaustive lists are hard to get wrong + STALE_CONSENSUS_VERSIONS = ['0.2.9.1-alpha-dev', + '0.2.9.2-alpha', + '0.2.9.2-alpha-dev', + '0.2.9.3-alpha', + '0.2.9.3-alpha-dev', + '0.2.9.4-alpha', + '0.2.9.4-alpha-dev', + '0.3.0.0-alpha-dev' + ] + + def is_valid_version(self): + # call _compute_version before calling this + # is the version of the relay a version we want as a fallback? + # checks both recommended versions and bug #20499 / #20509 + # + # if the relay doesn't have a recommended version field, exclude the relay + if not self._data.has_key('recommended_version'): + logging.info('%s not a candidate: no recommended_version field', + self._fpr) + return False + if not self._data['recommended_version']: + logging.info('%s not a candidate: version not recommended', self._fpr) + return False + # if the relay doesn't have version field, exclude the relay + if not self._data.has_key('version'): + logging.info('%s not a candidate: no version field', self._fpr) + return False + if self._data['version'] in Candidate.STALE_CONSENSUS_VERSIONS: + logging.warning('%s not a candidate: version delivers stale consensuses', + self._fpr) + return False + return True + @staticmethod def _extract_generic_history(history, which='unknown'): # given a tree like this: @@ -794,10 +850,8 @@ class Candidate(object): logging.info('%s not a candidate: badexit avg too high (%lf)', self._fpr, self._badexit) return False - # if the relay doesn't report a version, also exclude the relay - if (not self._data.has_key('recommended_version') - or not self._data['recommended_version']): - logging.info('%s not a candidate: version not recommended', self._fpr) + # this function logs a message depending on which check fails + if not self.is_valid_version(): return False if self._guard < CUTOFF_GUARD: logging.info('%s not a candidate: guard avg too low (%lf)', @@ -1264,7 +1318,8 @@ class CandidateList(dict): d = fetch('details', fields=('fingerprint,nickname,contact,last_changed_address_or_port,' + 'consensus_weight,advertised_bandwidth,or_addresses,' + - 'dir_address,recommended_version,flags,effective_family')) + 'dir_address,recommended_version,flags,effective_family,' + + 'platform')) logging.debug('Loading details document done.') if not 'relays' in d: raise Exception("No relays found in document.")

1 0

[tor/master] Add a missed return to fallbackdir_comment() in updateFallbackDirs.py
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 6ed8e3764b3c58f3f35402b2eacd03849baa73c8 Author: teor <teor2345(a)gmail.com> Date: Thu Sep 22 06:48:08 2016 +1000 Add a missed return to fallbackdir_comment() in updateFallbackDirs.py Closes ticket #20877. --- scripts/maint/updateFallbackDirs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 110ecda..094cbd8 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1183,6 +1183,7 @@ class Candidate(object): s += '\n' s += '*/' s += '\n' + return s # output the fallback info C string for this fallback # this is the text that would go after FallbackDir in a torrc

1 0

[tor/master] Select 200 fallback directories by default for each release
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 31e14396424b62efba5bd2f04e45dab6d834c2e6 Author: teor <teor2345(a)gmail.com> Date: Thu Sep 22 10:10:31 2016 +1000 Select 200 fallback directories by default for each release Closes ticket #20881. --- scripts/maint/updateFallbackDirs.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index e28185f..a3d0259 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -155,12 +155,10 @@ ONIONOO_SCALE_ONE = 999. _FB_POG = 0.2 FALLBACK_PROPORTION_OF_GUARDS = None if OUTPUT_CANDIDATES else _FB_POG -# We want exactly 100 fallbacks for the initial release -# This gives us scope to add extra fallbacks to the list as needed # Limit the number of fallbacks (eliminating lowest by advertised bandwidth) -MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 100 -# Emit a C #error if the number of fallbacks is below -MIN_FALLBACK_COUNT = 100 +MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 200 +# Emit a C #error if the number of fallbacks is more than 10% below MAX +MIN_FALLBACK_COUNT = 0 if OUTPUT_CANDIDATES else MAX_FALLBACK_COUNT*0.9 ## Fallback Bandwidth Requirements

1 0

[tor/master] Make fallback sort order configurable
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 864a8eb28374b8c70fc99643d91117fd42a6347b Author: teor <teor2345(a)gmail.com> Date: Sun Dec 4 20:12:23 2016 +1100 Make fallback sort order configurable Closes issue #20882. --- scripts/maint/updateFallbackDirs.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index a3d0259..826db6e 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -88,6 +88,12 @@ OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False CONTACT_COUNT = True if OUTPUT_CANDIDATES else False CONTACT_BLACKLIST_COUNT = True if OUTPUT_CANDIDATES else False +# How the list should be sorted: +# fingerprint: is useful for stable diffs of fallback lists +# measured_bandwidth: is useful when pruning the list based on bandwidth +# contact: is useful for contacting operators once the list has been pruned +OUTPUT_SORT_FIELD = 'contact' if OUTPUT_CANDIDATES else 'fingerprint' + ## OnionOO Settings ONIONOO = 'https://onionoo.torproject.org/' @@ -1304,10 +1310,9 @@ class CandidateList(dict): self.fallbacks.sort(key=lambda f: f._data['measured_bandwidth'], reverse=True) - # sort fallbacks by their fingerprint, lowest to highest - # this is useful for stable diffs of fallback lists - def sort_fallbacks_by_fingerprint(self): - self.fallbacks.sort(key=lambda f: f._fpr) + # sort fallbacks by the data field data_field, lowest to highest + def sort_fallbacks_by(self, data_field): + self.fallbacks.sort(key=lambda f: f._data[data_field]) @staticmethod def load_relaylist(file_name): @@ -1992,12 +1997,14 @@ def list_fallbacks(): for s in fetch_source_list(): print describe_fetch_source(s) + # sort the list differently depending on why we've created it: # if we're outputting the final fallback list, sort by fingerprint # this makes diffs much more stable - # otherwise, leave sorted by bandwidth, which allows operators to be - # contacted in priority order - if not OUTPUT_CANDIDATES: - candidates.sort_fallbacks_by_fingerprint() + # otherwise, if we're trying to find a bandwidth cutoff, or we want to + # contact operators in priority order, sort by bandwidth (not yet + # implemented) + # otherwise, if we're contacting operators, sort by contact + candidates.sort_fallbacks_by(OUTPUT_SORT_FIELD) for x in candidates.fallbacks: print x.fallbackdir_line(candidates.fallbacks, prefilter_fallbacks)

1 0

[tor/master] Update fallback whitelist and blacklist
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 49df83cc032d579ddaf48c86e0b07af8b94dbd4a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sat Jul 2 18:33:25 2016 +1000 Update fallback whitelist and blacklist Update fallback whitelist and blacklist based on: * pre-0.2.9 checks * operator opt-ins and opt-outs, via emails and tickets --- scripts/maint/fallback.blacklist | 20 +++++++++++++++++++ scripts/maint/fallback.whitelist | 42 ++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/scripts/maint/fallback.blacklist b/scripts/maint/fallback.blacklist index c9fd8a9..486226a 100644 --- a/scripts/maint/fallback.blacklist +++ b/scripts/maint/fallback.blacklist @@ -227,3 +227,23 @@ id=9C8A123081EFBE022EF795630F447839DDFDDDEC # 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 + +# Email sent directly to teor, verified using relay contact info +195.154.15.227:9030 orport=9001 id=6C3E3AB2F5F03CD71B637D433BAD924A1ECC5796 + +# Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 +195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64 +# Same operator, not on 0.2.8.6 list, also changed IPv4 +51.255.235.246:80 orport=443 id=9B99C72B02AF8E3E5BE3596964F9CACD0090D132 + +# Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 +5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 + +# Fallbacks were on 0.2.8.6 list, but went down before 0.2.9 +194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C +94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073 +195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197 +176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329 ipv6=[2001:41d0:8:eb9d::1]:22 + +# Fallback was on 0.2.8.6 list, but opted-out before 0.2.9 +144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907 diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index c801e46..4847557 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -59,9 +59,6 @@ # Email sent directly to teor, verified using relay contact info 91.121.84.137:4951 orport=4051 id=6DE61A6F72C1E5418A66BFED80DFB63E4C77668F -# https://lists.torproject.org/pipermail/tor-relays/2015-December/008380.html -5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 - # https://lists.torproject.org/pipermail/tor-relays/2015-December/008381.html # Sent additional email to teor with more relays 178.254.44.135:9030 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422 @@ -104,12 +101,9 @@ # Email sent directly to teor, verified using relay contact info 94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69 -# https://twitter.com/binarytenshi/status/717952514327453697 -94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073 - # Email sent directly to teor, verified using relay contact info -171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE ipv6=[2001:67c:289c:3::78]:443 171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A ipv6=[2001:67c:289c:3::77]:443 +171.25.193.78:80 orport=443 id=A478E421F83194C114F41E94F95999672AED51FE ipv6=[2001:67c:289c:3::78]:443 171.25.193.131:80 orport=443 id=79861CF8522FC637EF046F7688F5289E49D94576 171.25.193.20:80 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02 ipv6=[2001:67c:289c::20]:443 # OK, but same machine as 79861CF8522FC637EF046F7688F5289E49D94576 @@ -154,8 +148,6 @@ 178.16.208.59:80 orport=443 id=136F9299A5009A4E0E96494E723BDB556FB0A26B ipv6=[2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6]:443 # Email sent directly to teor, verified using relay contact info -195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64 -51.255.235.246:80 orport=443 id=9B99C72B02AF8E3E5BE3596964F9CACD0090D132 5.39.76.158:80 orport=443 id=C41F60F8B00E7FEF5CCC5BC6BB514CA1B8AAB651 # Email sent directly to teor, verified using relay contact info @@ -217,9 +209,6 @@ 86.59.119.88:80 orport=443 id=ACD889D86E02EDDAB1AFD81F598C0936238DC6D0 # Email sent directly to teor, verified using relay contact info -144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907 - -# Email sent directly to teor, verified using relay contact info 193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07 ipv6=[2001:6b0:7:125::243]:9001 109.105.109.162:52860 orport=60784 id=32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F ipv6=[2001:948:7:2::163]:5001 @@ -301,9 +290,6 @@ 212.47.230.49:9030 orport=9001 id=3D6D0771E54056AEFC28BB1DE816951F11826E97 # Email sent directly to teor, verified using relay contact info -176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329 ipv6=[2001:41d0:8:eb9d::1]:22 - -# Email sent directly to teor, verified using relay contact info 192.99.55.69:80 orport=443 id=0682DE15222A4A4A0D67DBA72A8132161992C023 192.99.59.140:80 orport=443 id=3C9148DA49F20654730FAC83FFF693A4D49D0244 51.254.215.13:80 orport=443 id=73C30C8ABDD6D9346C822966DE73B9F82CB6178A @@ -332,9 +318,6 @@ 212.47.241.21:80 orport=443 id=892F941915F6A0C6E0958E52E0A9685C190CF45C # Email sent directly to teor, verified using relay contact info -195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197 - -# Email sent directly to teor, verified using relay contact info 62.210.238.33:9030 orport=9001 id=FDF845FC159C0020E2BDDA120C30C5C5038F74B4 # Email sent directly to teor, verified using relay contact info @@ -444,9 +427,6 @@ 188.166.133.133:9030 orport=9001 id=774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7 ipv6=[2a03:b0c0:2:d0::5:f001]:9001 # Email sent directly to teor, verified using relay contact info -5.196.88.122:9030 orport=9001 id=0C2C599AFCB26F5CFC2C7592435924C1D63D9484 - -# Email sent directly to teor, verified using relay contact info 46.8.249.10:80 orport=443 id=31670150090A7C3513CB7914B9610E786391A95D # Email sent directly to teor, verified using relay contact info @@ -488,8 +468,10 @@ 167.114.152.100:9030 orport=443 id=0EF5E5FFC5D1EABCBDA1AFF6F6D6325C5756B0B2 ipv6=[2607:5300:100:200::1608]:443 # Email sent directly to teor, verified using relay contact info -192.99.168.102:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207 -167.114.153.21:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F +# Updated details from atlas based on ticket #20010 +163.172.176.167:80 orport=443 id=230A8B2A8BA861210D9B4BA97745AEC217A94207 +163.172.149.155:80 orport=443 id=0B85617241252517E8ECF2CFC7F4C1A32DCD153F +163.172.149.122:80 orport=443 id=A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2 # Email sent directly to teor, verified using relay contact info 204.11.50.131:9030 orport=9001 id=185F2A57B0C4620582602761097D17DB81654F70 @@ -498,9 +480,6 @@ 151.236.222.217:44607 orport=9001 id=94D58704C2589C130C9C39ED148BD8EA468DBA54 # Email sent directly to teor, verified using relay contact info -194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C - -# Email sent directly to teor, verified using relay contact info 185.35.202.221:9030 orport=9001 id=C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08 ipv6=[2a02:ed06::221]:9001 # Email sent directly to teor, verified using relay contact info @@ -603,7 +582,7 @@ 178.62.98.160:9030 orport=9001 id=8B92044763E880996A988831B15B2B0E5AD1544A # Email sent directly to teor, verified using relay contact info -195.154.15.227:9030 orport=9001 id=6C3E3AB2F5F03CD71B637D433BAD924A1ECC5796 +163.172.217.50:9030 orport=9001 id=02ECD99ECD596013A8134D46531560816ECC4BE6 # Email sent directly to teor, verified using relay contact info 185.100.86.100:80 orport=443 id=0E8C0C8315B66DB5F703804B3889A1DD66C67CE0 @@ -768,3 +747,12 @@ # Email sent directly to teor, verified using relay contact info 62.216.5.120:9030 orport=9001 id=D032D4D617140D6B828FC7C4334860E45E414FBE + +# Email sent directly to teor, verified using relay contact info +51.254.136.195:80 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63 + +# Email sent directly to teor, verified using relay contact info +163.172.13.165:9030 orport=9001 id=33DA0CAB7C27812EFF2E22C9705630A54D101FEB ipv6=[2001:bc8:38cb:201::8]:9001 + +# Email sent directly to teor, verified using relay contact info +5.196.88.122:9030 orport=9001 id=0C2C599AFCB26F5CFC2C7592435924C1D63D9484 ipv6=[2001:41d0:a:fb7a::1]:9001

1 0

[tor/master] Changes file for #20877, #20878, #20880, #20881, #20882
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 225c3d57db3158909377e9acbbf48725eed718ad Author: teor <teor2345(a)gmail.com> Date: Sun Dec 4 20:27:37 2016 +1100 Changes file for #20877, #20878, #20880, #20881, #20882 --- changes/fallbacks-201612 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/changes/fallbacks-201612 b/changes/fallbacks-201612 new file mode 100644 index 0000000..3b0395d --- /dev/null +++ b/changes/fallbacks-201612 @@ -0,0 +1,18 @@ + o Minor features (fallback directories): + - Select 200 fallback directories for each release. + Closes ticket 20881. + - Provide bandwidth and consensus weight for each candidate fallback in + updateFallbackDirs.py. + Closes ticket 20878. + - Require fallback directories to have the same address and port for + 6 months. (We expect to regenerate the fallback list each major Tor + release.) Relays whose OnionOO stability timer is reset on restart by + bug 18050 should upgrade to Tor 0.2.8.7 or later, which has a fix for + this issue. + Closes ticket 20880; removes short-term fix in e220214 in + tor-0.2.8.2-alpha. + - Make it easier to change the output sort order of fallbacks. + Closes ticket 20822. + o Minor bugfix (fallback directories): + - Stop failing when OUTPUT_COMMENTS is True in updateFallbackDirs.py. + Closes ticket 20877; bugfix on commit 9998343 in tor-0.2.8.3-alpha.

1 0

[tor/master] Exclude relays that deliver an expired consensus from the fallback list
by nickm＠torproject.org 20 Dec '16

20 Dec '16

commit 8381d928cfd5e0d1db8040e27e1e4d7d210a505a Author: teor <teor2345(a)gmail.com> Date: Tue Dec 6 22:25:12 2016 +1100 Exclude relays that deliver an expired consensus from the fallback list Part of #20539, based on #20501. --- scripts/maint/updateFallbackDirs.py | 40 +++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 0dfe0af..40b0056 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -38,7 +38,8 @@ import dateutil.parser #from bson import json_util import copy -from stem.descriptor.remote import DescriptorDownloader +from stem.descriptor import DocumentHandler +from stem.descriptor.remote import get_consensus import logging # INFO tells you why each relay was included or excluded @@ -80,6 +81,9 @@ PERFORM_IPV4_DIRPORT_CHECKS = False if OUTPUT_CANDIDATES else True # Don't check ~1000 candidates when OUTPUT_CANDIDATES is True PERFORM_IPV6_DIRPORT_CHECKS = False if OUTPUT_CANDIDATES else False +# Clients have been using microdesc consensuses by default for a while now +DOWNLOAD_MICRODESC_CONSENSUS = True + # Output fallback name, flags, bandwidth, and ContactInfo in a C comment? OUTPUT_COMMENTS = True if OUTPUT_CANDIDATES else False @@ -1120,25 +1124,30 @@ class Candidate(object): return True return False - # report how long it takes to download a consensus from dirip:dirport + # log how long it takes to download a consensus from dirip:dirport + # returns True if the download failed, False if it succeeded within max_time @staticmethod def fallback_consensus_download_speed(dirip, dirport, nickname, max_time): download_failed = False - downloader = DescriptorDownloader() start = datetime.datetime.utcnow() # some directory mirrors respond to requests in ways that hang python # sockets, which is why we log this line here - logging.info('Initiating consensus download from %s (%s:%d).', nickname, - dirip, dirport) + logging.info('Initiating %sconsensus download from %s (%s:%d).', + 'microdesc ' if DOWNLOAD_MICRODESC_CONSENSUS else '', + nickname, dirip, dirport) # there appears to be about 1 second of overhead when comparing stem's # internal trace time and the elapsed time calculated here TIMEOUT_SLOP = 1.0 try: - downloader.get_consensus(endpoints = [(dirip, dirport)], - timeout = (max_time + TIMEOUT_SLOP), - validate = True, - retries = 0, - fall_back_to_authority = False).run() + consensus = get_consensus( + endpoints = [(dirip, dirport)], + timeout = (max_time + TIMEOUT_SLOP), + validate = True, + retries = 0, + fall_back_to_authority = False, + document_handler = DocumentHandler.BARE_DOCUMENT, + microdescriptor = DOWNLOAD_MICRODESC_CONSENSUS + ).run()[0] except Exception, stem_error: logging.info('Unable to retrieve a consensus from %s: %s', nickname, stem_error) @@ -1146,10 +1155,19 @@ class Candidate(object): level = logging.WARNING download_failed = True elapsed = (datetime.datetime.utcnow() - start).total_seconds() - if elapsed > max_time: + if download_failed: + # keep the error failure status + pass + elif elapsed > max_time: status = 'too slow' level = logging.WARNING download_failed = True + elif datetime.datetime.utcnow() > consensus.valid_until: + time_since_expiry = (datetime.datetime.utcnow() - + consensus.valid_until).total_seconds() + status = 'outdated consensus, expired %ds ago'%(int(time_since_expiry)) + level = logging.WARNING + download_failed = True else: status = 'ok' level = logging.DEBUG

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2016