October 2015 - tor-commits - lists.torproject.org

[metrics-db/master] Add new @type for hidden service descriptors.
by karsten＠torproject.org 12 Oct '15

12 Oct '15

commit c53d777bd209732760908807f05d1a90493aba9b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 12 09:28:34 2015 +0200 Add new @type for hidden service descriptors. Suggested by atagar. Descriptors of this @type are not archive by CollecTor, but libraries like Stem that support parsing many of the descriptors listed on CollecTor also support parsing this type, so it makes sense to list it here. Implements #15009. --- web/formats.html | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/web/formats.html b/web/formats.html index 222fb8f..84a4a99 100644 --- a/web/formats.html +++ b/web/formats.html @@ -374,6 +374,39 @@ file to reduce the number of files. <div class="box"> +<a name="hidden-service-descriptors"></a> +<h2>Tor hidden service descriptors <a +href="#hidden-service-descriptors">#</a></h2> + +<p> +Tor hidden services make it possible for users to hide their locations +while offering various kinds of services, such as web publishing or an +instant messaging server. +A hidden service assembles a hidden service descriptor to make its service +available in the network. +This descriptor gets stored on hidden service directories and can be +retrieved by hidden service clients. +Hidden service descriptors are not formally archived, but some libraries +support parsing these descriptors when obtaining them from a locally +running Tor instance. +</p> + +<h3>Hidden service descriptors +<span class="type-annotation"><tt>@type hidden-service-descriptor +1.0</tt></span> +</h3> + +<p> +Hidden service descriptors contain all details that are necessary for +clients to connect to a hidden service. +Despite the version number being 1.0, these descriptors are part of the +version 2 hidden service protocol. +</p> + +</div>  + +<div class="box"> + <a name="bridge-pool-assignments"></a> <h2>BridgeDB's bridge pool assignments <a href="#bridge-pool-assignments">#</a></h2>

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 12 Oct '15

12 Oct '15

commit 58e762d8d1fefb1d17b704a1aa2e87994408e590 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 12 06:45:16 2015 +0000 Update translations for https_everywhere --- hi/https-everywhere.dtd | 6 +++--- ur/https-everywhere.dtd | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd index 21a0386..a29c6d4 100644 --- a/hi/https-everywhere.dtd +++ b/hi/https-everywhere.dtd @@ -1,5 +1,5 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में"> +<!ENTITY https-everywhere.about.ext_name "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE)"> <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> <!ENTITY https-everywhere.about.version "संस्करण"> <!ENTITY https-everywhere.about.created_by "के द्वारा बनाई गई"> @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.about.or "or"> <!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "हाइपर टेक्स्ट ट्रांसफर प्रोटोकॉल सिक्योर हर जगह (HTTPS EVERYWHERE) के बारे में"> <!ENTITY https-everywhere.menu.observatory "एसएसएल वेधशाला प्राथमिकताएं"> <!ENTITY https-everywhere.menu.globalEnable "हर जगह HTTPS सक्षम"> <!ENTITY https-everywhere.menu.globalDisable "हर जगह HTTPS अक्षम"> diff --git a/ur/https-everywhere.dtd b/ur/https-everywhere.dtd index eac7ddf..9533210 100644 --- a/ur/https-everywhere.dtd +++ b/ur/https-everywhere.dtd @@ -1,5 +1,5 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ (HTTPS Everywhere) کے بارے میں "> +<!ENTITY https-everywhere.about.ext_name "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ "> <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> <!ENTITY https-everywhere.about.version "Version"> <!ENTITY https-everywhere.about.created_by "Created by"> @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.about.or "or"> <!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "ہائپر ٹیکسٹ پروٹوکول ہر جگہ (HTTPS Everywhere) کے بارے میں "> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere">

1 0

[tor-messenger-build/master] Patch for adding MOZ_SANDBOX flag to GMPLoader.h
by sukhbir＠torproject.org 11 Oct '15

11 Oct '15

commit c7bf42c58ff28204eed1418dc670c2249976da2b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Oct 11 19:17:25 2015 -0400 Patch for adding MOZ_SANDBOX flag to GMPLoader.h From https://github.com/Alexpux/MINGW-packages (patch by Ray Donnelly) --- projects/instantbird/config | 2 ++ projects/instantbird/gmploader-sandbox.mozpatch | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 8a45142..7eae10e 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -114,6 +114,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch enable: '[% c("var/windows") %]' + - filename: gmploader-sandbox.mozpatch + enable: '[% c("var/windows") %]' - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch enable: '[% c("var/windows") %]' - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch diff --git a/projects/instantbird/gmploader-sandbox.mozpatch b/projects/instantbird/gmploader-sandbox.mozpatch new file mode 100644 index 0000000..a9d167c --- /dev/null +++ b/projects/instantbird/gmploader-sandbox.mozpatch @@ -0,0 +1,12 @@ +diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp +--- a/dom/media/gmp/GMPLoader.cpp ++++ b/dom/media/gmp/GMPLoader.cpp +@@ -227,7 +227,7 @@ + + // Load the GMP. + PRLibSpec libSpec; +-#ifdef XP_WIN ++#if defined(XP_WIN) && defined(MOZ_SANDBOX) + libSpec.value.pathname_u = widePath; + libSpec.type = PR_LibSpec_PathnameU; + #else

1 0

[tor-messenger-build/master] Remove Windows build patches merged upstream
by sukhbir＠torproject.org 11 Oct '15

11 Oct '15

commit 88f1a3af39a2c622ceb71c9e87be1674b8cb9be9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Oct 11 19:13:55 2015 -0400 Remove Windows build patches merged upstream --- projects/instantbird/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 8838c70..8a45142 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -114,14 +114,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch - enable: '[% c("var/windows") %]' - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch enable: '[% c("var/windows") %]' - - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch - enable: '[% c("var/windows") %]' - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch enable: '[% c("var/windows") %]' - filename: 0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch

1 0

[tor-messenger-build/master] Add patch for bug 1176731; MinGW cross-compilation error
by sukhbir＠torproject.org 11 Oct '15

11 Oct '15

commit 161f6110a0862d34a1ec9498878ef40137cc9347 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Oct 11 13:32:29 2015 -0400 Add patch for bug 1176731; MinGW cross-compilation error --- ...31-do-not-mark-static-inline-functions.mozpatch | 29 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 31 insertions(+) diff --git a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch new file mode 100644 index 0000000..7580ea0 --- /dev/null +++ b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch @@ -0,0 +1,29 @@ +From: Jacek Caban <jacek(a)codeweavers.com> +Don't maek static inline functions as MFBT_API in TimeStamp.h. + + +diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h +index 8f043d4..c2c9cf9 100644 +--- a/mozglue/misc/TimeStamp.h ++++ b/mozglue/misc/TimeStamp.h +@@ -421,18 +421,18 @@ public: + * Now() is trying to ensure the best possible precision on each platform, + * at least one millisecond. + * + * NowLoRes() has been introduced to workaround performance problems of + * QueryPerformanceCounter on the Windows platform. NowLoRes() is giving + * lower precision, usually 15.6 ms, but with very good performance benefit. + * Use it for measurements of longer times, like >200ms timeouts. + */ +- static MFBT_API TimeStamp Now() { return Now(true); } +- static MFBT_API TimeStamp NowLoRes() { return Now(false); } ++ static TimeStamp Now() { return Now(true); } ++ static TimeStamp NowLoRes() { return Now(false); } + + /** + * Return a timestamp representing the time when the current process was + * created which will be comparable with other timestamps taken with this + * class. If the actual process creation time is detected to be inconsistent + * the @a aIsInconsistent parameter will be set to true, the returned + * timestamp however will still be valid though inaccurate. + * diff --git a/projects/instantbird/config b/projects/instantbird/config index a385bd0..8838c70 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -112,6 +112,8 @@ input_files: enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' + - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch + enable: '[% c("var/windows") %]' - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch enable: '[% c("var/windows") %]' - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch

1 0

[stem/master] Unit test failure due to tor26 no longer being a bwauth
by atagar＠torproject.org 11 Oct '15

11 Oct '15

commit ac33817373acd2e71bce76d0dde7ce779067f8a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 11 10:13:07 2015 -0700 Unit test failure due to tor26 no longer being a bwauth Oops, missed that one of our unit tests expected that tor26 was a bandwidth authority. --- test/unit/tutorial_examples.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index a8382a3..80a6451 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -89,8 +89,6 @@ moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5 VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured -Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: - 5735 measured entries and 1690 unmeasured Getting moria1's vote from http://128.31.0.39:9131/tor/status-vote/current/authority: 6647 measured entries and 625 unmeasured Getting maatuska's vote from http://171.25.193.9:443/tor/status-vote/current/authority: @@ -285,7 +283,6 @@ class TestTutorialExamples(unittest.TestCase): def test_votes_by_bandwidth_authorities(self, query_mock, get_authorities_mock, stdout_mock): directory_values = [ DIRECTORY_AUTHORITIES['gabelmoo'], - DIRECTORY_AUTHORITIES['tor26'], DIRECTORY_AUTHORITIES['moria1'], DIRECTORY_AUTHORITIES['maatuska'], ] @@ -301,18 +298,14 @@ class TestTutorialExamples(unittest.TestCase): query1.run.return_value = [entry_with_measurement] * 5935 + [entry_without_measurement] * 1332 query2 = Mock() - query2.download_url = 'http://86.59.21.38:80/tor/status-vote/current/authority' - query2.run.return_value = [entry_with_measurement] * 5735 + [entry_without_measurement] * 1690 + query2.download_url = 'http://128.31.0.39:9131/tor/status-vote/current/authority' + query2.run.return_value = [entry_with_measurement] * 6647 + [entry_without_measurement] * 625 query3 = Mock() - query3.download_url = 'http://128.31.0.39:9131/tor/status-vote/current/authority' - query3.run.return_value = [entry_with_measurement] * 6647 + [entry_without_measurement] * 625 + query3.download_url = 'http://171.25.193.9:443/tor/status-vote/current/authority' + query3.run.return_value = [entry_with_measurement] * 6313 + [entry_without_measurement] * 1112 - query4 = Mock() - query4.download_url = 'http://171.25.193.9:443/tor/status-vote/current/authority' - query4.run.return_value = [entry_with_measurement] * 6313 + [entry_without_measurement] * 1112 - - query_mock.side_effect = [query1, query2, query3, query4] + query_mock.side_effect = [query1, query2, query3] exec_documentation_example('votes_by_bandwidth_authorities.py') self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue())

1 0

[doctor/master] Drop hack to disable tor26 bwauth checks
by atagar＠torproject.org 11 Oct '15

11 Oct '15

commit 1ff437ac3024d2c3b324988c8c2dd2d859a44d2f Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 11 10:02:05 2015 -0700 Drop hack to disable tor26 bwauth checks Flag is dropped from Stem now that tor26 is no longer a bandwidth authority, so we can disable the hack here. --- consensus_health_checker.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 1a9608d..b4e16a9 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -51,10 +51,6 @@ downloader = stem.descriptor.remote.DescriptorDownloader( Destination = collections.namedtuple('Destination', ('address', 'bcc')) -# weasel gave a notice on 5/20/15 that tor26's bandwidth auth was having issues - -DIRECTORY_AUTHORITIES['tor26'].is_bandwidth_authority = False - class Issue(object): """

1 0

[stem/master] tor26 is no longer a bandwidth authority
by atagar＠torproject.org 11 Oct '15

11 Oct '15

commit d5913fb1a3a233763a93e158abe5b780d4e0f006 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 11 10:00:21 2015 -0700 tor26 is no longer a bandwidth authority While ago I disabled DocTor's bandwidth authority checks of tor26 on weasel's request. Checked back in recently and weasel says tor26 is no longer a bwauth so dropping the flag. --- docs/change_log.rst | 2 +- stem/descriptor/remote.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index cfd26d1..cc2cd88 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -63,7 +63,7 @@ The following are only available within Stem's `git repository * **Utilities** - * Added :func:`stem.util.datetime_to_unix` + * Added :func:`~stem.util.__init__.datetime_to_unix` * **Interpreter** diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index fbc9d96..095f125 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -686,7 +686,7 @@ DIRECTORY_AUTHORITIES = { address = '86.59.21.38', or_port = 443, dir_port = 80, - is_bandwidth_authority = True, + is_bandwidth_authority = False, fingerprint = '847B1F850344D7876491A54892F904934E4EB85D', v3ident = '14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4', ),

1 0

[doctor/master] Download from authorities in serial
by atagar＠torproject.org 11 Oct '15

11 Oct '15

commit b2772926bbf9b5f1565b07be96faf053f64bda71 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 11 09:42:02 2015 -0700 Download from authorities in serial Parallel downloads no longer make sense now that we're checking authority latency. Attempting to do multiple at once skew our metrics. --- consensus_health_checker.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index d34db57..1a9608d 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -762,7 +762,7 @@ def get_votes(): def _get_documents(label, resource): - queries, documents, issues = {}, {}, [] + documents, times_taken, issues = {}, {}, [] for authority in DIRECTORY_AUTHORITIES.values(): # skip urras, it's having a long outage @@ -773,25 +773,22 @@ def _get_documents(label, resource): if authority.v3ident is None: continue # not a voting authority - queries[authority.nickname] = downloader.query( + query = downloader.query( resource, endpoints = [(authority.address, authority.dir_port)], default_params = False, validate = True, ) - times_taken = {} - - for authority, query in queries.items(): try: start_time = time.time() - documents[authority] = query.run()[0] - times_taken[authority] = time.time() - start_time + documents[authority.nickname] = query.run()[0] + times_taken[authority.nickname] = time.time() - start_time except Exception as exc: if label == 'vote': # try to download the vote via the other authorities - v3ident = DIRECTORY_AUTHORITIES[authority].v3ident + v3ident = DIRECTORY_AUTHORITIES[authority.nickname].v3ident query = downloader.query( '/tor/status-vote/current/%s.z' % v3ident, @@ -802,10 +799,10 @@ def _get_documents(label, resource): query.run(True) if not query.error: - documents[authority] = list(query)[0] + documents[authority.nickname] = list(query)[0] continue - issues.append(Issue(Runlevel.ERROR, 'AUTHORITY_UNAVAILABLE', fetch_type = label, authority = authority, url = query.download_url, error = exc, to = [authority])) + issues.append(Issue(Runlevel.ERROR, 'AUTHORITY_UNAVAILABLE', fetch_type = label, authority = authority.nickname, url = query.download_url, error = exc, to = [authority.nickname])) if label == 'consensus': median_time = sorted(times_taken.values())[len(times_taken) / 2]

1 0

[doctor/master] Notification for especially high latency
by atagar＠torproject.org 10 Oct '15

10 Oct '15

commit f993fccf0e1ad319920a3ae446d26f3ae8b5de43 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 10 16:23:54 2015 -0700 Notification for especially high latency We've had ongoing latency issues with Faravahar for a while now. Adding a notice level check to better surface this... NOTICE: Downloading the consensus from Faravahar took 74.5s. Median download time is 3.0s: maatuska => 9.6s, tor26 => 2.6s, longclaw => 2.8s, dizum => 2.7s, gabelmoo => 2.9s, moria1 => 3.0s, dannenberg => 3.3s, Faravahar => 74.5s --- consensus_health_checker.py | 17 +++++++++++++++++ data/consensus_health.cfg | 1 + 2 files changed, 18 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index d762f74..d34db57 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -140,6 +140,11 @@ class Issue(object): attr.update({'authorities': ''}) return CONFIG['msg'][self._template].format(**attr).replace(' ', '_') + elif self._template == 'LATENCY': + attr = dict(self._attr) + attr.update({'authority': '', 'time_taken': '', 'median_time': '', 'authority_times': ''}) + + return CONFIG['msg'][self._template].format(**attr).replace(' ', '_') else: return self.get_message().replace(' ', '_') @@ -775,9 +780,13 @@ def _get_documents(label, resource): validate = True, ) + times_taken = {} + for authority, query in queries.items(): try: + start_time = time.time() documents[authority] = query.run()[0] + times_taken[authority] = time.time() - start_time except Exception as exc: if label == 'vote': # try to download the vote via the other authorities @@ -798,6 +807,14 @@ def _get_documents(label, resource): issues.append(Issue(Runlevel.ERROR, 'AUTHORITY_UNAVAILABLE', fetch_type = label, authority = authority, url = query.download_url, error = exc, to = [authority])) + if label == 'consensus': + median_time = sorted(times_taken.values())[len(times_taken) / 2] + authority_times = ', '.join(['%s => %0.1fs' % (authority, time_taken) for authority, time_taken in times_taken.items()]) + + for authority, time_taken in times_taken.items(): + if time_taken > median_time * 5: + issues.append(Issue(Runlevel.NOTICE, 'LATENCY', authority = authority, time_taken = '%0.1fs' % time_taken, median_time = '%0.1fs' % median_time, authority_times = authority_times, to = [authority])) + return documents, issues diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 7e30fd0..2c5652a 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -1,5 +1,6 @@ # message templates for notifications we send +msg LATENCY => Downloading the consensus from {authority} took {time_taken}. Median download time is {median_time}: {authority_times} msg MISSING_LATEST_CONSENSUS => The consensuses published by the following directory authorities are more than one hour old and therefore not fresh anymore: {authorities} msg CONSENSUS_METHOD_UNSUPPORTED => The following directory authorities do not support the consensus method that the consensus uses: {authorities} msg DIFFERENT_RECOMMENDED_VERSION => The following directory authorities recommend other {type} versions than the consensus: {differences}

1 0