July 2013 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Jul '13

26 Jul '13

commit 71b18699eee33ab0b6307b9565108c2e623f2463 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 26 15:46:00 2013 +0000 Update translations for torcheck --- pt/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/torcheck.po b/pt/torcheck.po index 8faa859..2c8b463 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -3,14 +3,15 @@ # # Translators: # flavioamieiro <flavioamieiro(a)gmail.com>, 2012 +# SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-05-22 12:30+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-26 15:30+0000\n" +"Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +27,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Por favor visite o <a href=\"https://www.torproject.org/\">website do Tor</a> para mais informações sobre como usar o Tor de maneira segura. Você está agora livre para navegar na Internet anonimamente." +msgstr "Por favor visite o <a href=\"https://www.torproject.org/\">website do Tor</a> para mais informações sobre como usar o Tor de maneira segura. Está agora preparado para navegar na Internet, anonimamente." msgid "There is a security update available for the Tor Browser Bundle." msgstr "" @@ -44,7 +45,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Se você está tentando usar um cliente do Tor, por favor visite o <a href=\"https://www.torproject.org/\">website do Tor</a> e, mais especificamente, as <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruções para configurar seu cliente do Tor</a>." +msgstr "Se está tentando usar um cliente Tor, por favor visite o <a href=\"https://www.torproject.org/\">website do Tor</a> e, mais especificamente, as <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruções para configurar o seu cliente Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Infelizmente, o seu pedido falhou ou uma resposta inesperada foi recebida."

1 0

[stem/master] Having use_directory_mirrors() return the consensus
by atagar＠torproject.org 26 Jul '13

26 Jul '13

commit d7b68d01aabc6fdcd544a479cfa2cac377eaddeb Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 26 08:13:58 2013 -0700 Having use_directory_mirrors() return the consensus Originally I was planning an on-disk cache so calling get_consensus() after use_directory_mirrors() would result in an on-disk read. However, that has been put on hold for now so having use_directory_mirrors() return the consensus it fetches in order to get the mirrors. We unfortunately already need to read the full consensus into memory before processing it due to how urllib2 works, so this shouldn't cause a memory usage hit. We might someday want to change this though if we get a constant time download/parsing scheme. --- stem/descriptor/remote.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index da1df63..8b6497f 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -391,7 +391,7 @@ class DescriptorDownloader(object): try: start_time = time.time() self.use_directory_mirrors() - log.debug("Retrieve directory mirrors (took %0.2fs)" % (time.time() - start_time)) + log.debug("Retrieved directory mirrors (took %0.2fs)" % (time.time() - start_time)) except Exception as exc: log.debug("Unable to retrieve directory mirrors: %s" % exc) @@ -400,12 +400,17 @@ class DescriptorDownloader(object): Downloads the present consensus and configures ourselves to use directory mirrors, in addition to authorities. + :returns: :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3` + from which we got the directory mirrors + :raises: **Exception** if unable to determine the directory mirrors """ new_endpoints = set(DIRECTORY_AUTHORITIES.values()) - for desc in self.get_consensus().run(): + consensus = list(self.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT).run())[0] + + for desc in consensus.routers: if Flag.V2DIR in desc.flags: new_endpoints.add((desc.address, desc.dir_port)) @@ -413,6 +418,8 @@ class DescriptorDownloader(object): self._endpoints = list(new_endpoints) + return consensus + def get_server_descriptors(self, fingerprints = None, **query_args): """ Provides the server descriptors with the given fingerprints. If no

1 0

r26261: {website} Change wording of 'pluggable transports' in homepage. (website/trunk/en)
by George Kadianakis 26 Jul '13

26 Jul '13

Author: asn Date: 2013-07-26 14:55:31 +0000 (Fri, 26 Jul 2013) New Revision: 26261 Modified: website/trunk/en/index.wml Log: Change wording of 'pluggable transports' in homepage. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-07-26 14:55:29 UTC (rev 26260) +++ website/trunk/en/index.wml 2013-07-26 14:55:31 UTC (rev 26261) @@ -122,7 +122,7 @@ <a href="<page projects/obfsproxy>"><img src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Pluggable Transports Icon"></a> <h3><a href="<page projects/obfsproxy>">Pluggable Transports</a></h3> - <p>Pluggable transports are tools that attempts to circumvent censorship.</p> + <p>Pluggable transports help you circumvent censorship.</p> </div> </td> </tr>

1 0

r26260: {website} Change 'obfsproxy' to 'pluggable transports' in the homepage (in website/trunk: docs/en en)
by George Kadianakis 26 Jul '13

26 Jul '13

Author: asn Date: 2013-07-26 14:55:29 +0000 (Fri, 26 Jul 2013) New Revision: 26260 Modified: website/trunk/docs/en/pluggable-transports.wml website/trunk/en/index.wml Log: Change 'obfsproxy' to 'pluggable transports' in the homepage. Patch provided by mttp. Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2013-07-25 13:33:53 UTC (rev 26259) +++ website/trunk/docs/en/pluggable-transports.wml 2013-07-26 14:55:29 UTC (rev 26260) @@ -36,7 +36,7 @@ <ul> - <li><b>Obfsproxy</b> is a Python framework for implementing new + <li><a href="https://www.torproject.org/projects/obfsproxy.html.en"><b>Obfsproxy</b></a> is a Python framework for implementing new pluggable transports. It uses Twisted for its networking needs, and <a href="https://gitweb.torproject.org/pluggable-transports/pyptlib.git/blob/HEAD:/R…">pyptlib</a> for some pluggable transport-related features. It supports the Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-07-25 13:33:53 UTC (rev 26259) +++ website/trunk/en/index.wml 2013-07-26 14:55:29 UTC (rev 26260) @@ -1,5 +1,5 @@ ## translation metadata -# Revision: $Revision$ +# Revision: $Revision: 26248 $ # Translation-Priority: 1-high #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" @@ -120,9 +120,9 @@ <td> <div class="project"> <a href="<page projects/obfsproxy>"><img - src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Obfsproxy Icon"></a> - <h3><a href="<page projects/obfsproxy>">Obfsproxy</a></h3> - <p>Obfsproxy is a tool that attempts to circumvent censorship.</p> + src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Pluggable Transports Icon"></a> + <h3><a href="<page projects/obfsproxy>">Pluggable Transports</a></h3> + <p>Pluggable transports are tools that attempts to circumvent censorship.</p> </div> </td> </tr>

1 0

[tor/master] Allow {, k, kilo, m, mega, g, giga, t, tera}bit{, s} in torrc
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit d5a5a6a2534e114b6c89c7ddb7840ab3040657b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 26 16:07:11 2013 +0200 Allow {,k,kilo,m,mega,g,giga,t,tera}bit{,s} in torrc Patch from CharlieB for ticket #9214 --- changes/ticket_9214 | 6 ++++++ doc/tor.1.txt | 22 +++++++++++----------- src/or/confparse.c | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/changes/ticket_9214 b/changes/ticket_9214 new file mode 100644 index 0000000..f1e43ca --- /dev/null +++ b/changes/ticket_9214 @@ -0,0 +1,6 @@ + o Minor features: + - Accept bandwidth and space limits in bits as well as bytes. + (Anywhere in the configuration file that you can say "2 Kilobytes", + you can now say "16 kilobits", and so on.) Resolves ticket 9214. + Patch by CharlieB. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d13ec20..fa49f14 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -124,42 +124,42 @@ option name with a forward slash. GENERAL OPTIONS --------------- -**BandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**BandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the public network, this needs to be _at the very least_ 30 KBytes (that is, 30720 bytes). (Default: 1 GByte) -**BandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**BandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: Limit the maximum token bucket size (also known as the burst) to the given number of bytes in each direction. (Default: 1 GByte) -**MaxAdvertisedBandwidth** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**MaxAdvertisedBandwidth** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: If set, we will not advertise more than this amount of bandwidth for our BandwidthRate. Server operators who want to reduce the number of clients who ask to build circuits through them (since this is proportional to advertised bandwidth rate) can thus reduce the CPU demands on their server without impacting network performance. -**RelayBandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**RelayBandwidthRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: If not 0, a separate token bucket limits the average incoming bandwidth usage for \_relayed traffic_ on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. Relayed traffic currently is calculated to include answers to directory requests, but that may change in future versions. (Default: 0) -**RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: If not 0, limit the maximum token bucket size (also known as the burst) for \_relayed traffic_ to the given number of bytes in each direction. (Default: 0) -**PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) -**PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) @@ -1542,7 +1542,7 @@ is non-zero): server is still alive and doing useful things. Settings this to 0 will disable the heartbeat. (Default: 6 hours) -**AccountingMax** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**:: +**AccountingMax** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**|**TBytes**:: Never send more than the specified number of bytes in a given accounting period, or receive more than that number in the period. For example, with AccountingMax set to 1 GByte, a server could send 900 MBytes and @@ -1874,12 +1874,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies to addresses shared with directory authorities. (Default: 5) -**AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: Authoritative directories only. If non-zero, always vote the Fast flag for any relay advertising this amount of capacity or more. (Default: 100 KBytes) -**AuthDirGuardBWGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**AuthDirGuardBWGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: Authoritative directories only. If non-zero, this advertised capacity or more is always sufficient to satisfy the bandwidth requirement for the Guard flag. (Default: 250 KBytes) @@ -2065,7 +2065,7 @@ The following options are used for running a testing Tor network. time. Changing this requires that **TestingTorNetwork** is set. (Default: 10 minutes) -**TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: +**TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) diff --git a/src/or/confparse.c b/src/or/confparse.c index eb0362f..4105579 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -1126,20 +1126,36 @@ static struct unit_table_t memory_units[] = { { "kbytes", 1<<10 }, { "kilobyte", 1<<10 }, { "kilobytes", 1<<10 }, + { "kilobits", 1<<7 }, + { "kilobit", 1<<7 }, + { "kbits", 1<<7 }, + { "kbit", 1<<7 }, { "m", 1<<20 }, { "mb", 1<<20 }, { "mbyte", 1<<20 }, { "mbytes", 1<<20 }, { "megabyte", 1<<20 }, { "megabytes", 1<<20 }, + { "megabits", 1<<17 }, + { "megabit", 1<<17 }, + { "mbits", 1<<17 }, + { "mbit", 1<<17 }, { "gb", 1<<30 }, { "gbyte", 1<<30 }, { "gbytes", 1<<30 }, { "gigabyte", 1<<30 }, { "gigabytes", 1<<30 }, + { "gigabits", 1<<27 }, + { "gigabit", 1<<27 }, + { "gbits", 1<<27 }, + { "gbit", 1<<27 }, { "tb", U64_LITERAL(1)<<40 }, { "terabyte", U64_LITERAL(1)<<40 }, { "terabytes", U64_LITERAL(1)<<40 }, + { "terabits", U64_LITERAL(1)<<37 }, + { "terabit", U64_LITERAL(1)<<37 }, + { "tbits", U64_LITERAL(1)<<37 }, + { "tbit", U64_LITERAL(1)<<37 }, { NULL, 0 }, };

1 0

[tor/master] Fix bug9309, and n_noncanonical count/continue code
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit 1d2e8020b7be5aff08cfde6f94c24b145625c1ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 11:52:10 2013 +0200 Fix bug9309, and n_noncanonical count/continue code When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy. --- changes/bug9309 | 6 ++++++ src/or/channel.c | 4 ++-- src/or/channeltls.c | 5 ++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug9309 b/changes/bug9309 new file mode 100644 index 0000000..38c462b --- /dev/null +++ b/changes/bug9309 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - When evaluating whether to use a connection that we haven't + decided is canonical using a recent link protocol version, + decide that it's canonical only if it used address _does_ + match the desired address. Fixes bug 9309; bugfix on + 0.2.4.4-alpha. Reported by skruffy. diff --git a/src/or/channel.c b/src/or/channel.c index 4e9086f..602797d 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3037,7 +3037,7 @@ channel_get_for_extend(const char *digest, if (chan->state != CHANNEL_STATE_OPEN) { /* If the address matches, don't launch a new connection for this * circuit. */ - if (!channel_matches_target_addr_for_extend(chan, target_addr)) + if (channel_matches_target_addr_for_extend(chan, target_addr)) ++n_inprogress_goodaddr; continue; } @@ -4053,7 +4053,7 @@ channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info) } /** - * Check if a channel matches a given target address + * Check if a channel matches a given target address; return true iff we do. * * This function calls into the lower layer and asks if this channel thinks * it matches a given target address for circuit extension purposes. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 60693da..d758d22 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -546,7 +546,7 @@ channel_tls_matches_extend_info_method(channel_t *chan, } /** - * Check if we match a target address + * Check if we match a target address; return true iff we do. * * This implements the matches_target method for channel_tls t_; the upper * layer wants to know if this channel matches a target address when extending @@ -563,8 +563,7 @@ channel_tls_matches_target_method(channel_t *chan, tor_assert(target); tor_assert(tlschan->conn); - return tor_addr_compare(&(tlschan->conn->real_addr), - target, CMP_EXACT); + return tor_addr_eq(&(tlschan->conn->real_addr), target); } /**

1 0

[tor/master] fix typo
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit 0eca8737a1a35204be92eac12f2bf8748ac29004 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 18 23:35:20 2013 -0400 fix typo --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cd67d82..d5fab04 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1669,7 +1669,7 @@ is non-zero): If it hits this threshold, it will begin killing circuits until it has recovered at least 10% of this memory. Do not set this option too low, or your relay may be unreliable under load. This option only - effects circuit queues, so the actual process size will be larger than + affects circuit queues, so the actual process size will be larger than this. (Default: 8GB) DIRECTORY SERVER OPTIONS

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit 221a0159b81707f7cfcb3ec34c21830e9ce8aca5 Merge: 5d4b501 8d0fb3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 26 15:42:10 2013 +0200 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9337 | 4 ++++ src/or/dns.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'bug9337' into maint-0.2.4
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit 8d0fb3a4347aa543d2aa27f177446888fbdae125 Merge: 1d2e802 11f1b7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 26 15:41:35 2013 +0200 Merge branch 'bug9337' into maint-0.2.4 changes/bug9337 | 4 ++++ src/or/dns.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Avoid assertion failure on unexepcted address family in DNS reply.
by nickm＠torproject.org 26 Jul '13

26 Jul '13

commit 11f1b7d9dfa8434c629339220ed47f87a957344b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 26 15:33:46 2013 +0200 Avoid assertion failure on unexepcted address family in DNS reply. Fixes bug 9337; bugfix on 0.2.4.7-alpha. --- changes/bug9337 | 4 ++++ src/or/dns.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug9337 b/changes/bug9337 new file mode 100644 index 0000000..ce99bc8 --- /dev/null +++ b/changes/bug9337 @@ -0,0 +1,4 @@ + o Major bugfixes (DNS): + - Avoid an assertion failure when processing DNS replies without the + answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha. + diff --git a/src/or/dns.c b/src/or/dns.c index edcf92e..f2b7eec 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -437,8 +437,8 @@ cached_resolve_add_answer(cached_resolve_t *resolve, if (resolve->res_status_ipv4 != RES_STATUS_INFLIGHT) return; - if (dns_result == DNS_ERR_NONE && answer_addr) { - tor_assert(tor_addr_family(answer_addr) == AF_INET); + if (dns_result == DNS_ERR_NONE && answer_addr && + tor_addr_family(answer_addr) == AF_INET) { resolve->result_ipv4.addr_ipv4 = tor_addr_to_ipv4h(answer_addr); resolve->res_status_ipv4 = RES_STATUS_DONE_OK; } else { @@ -450,8 +450,8 @@ cached_resolve_add_answer(cached_resolve_t *resolve, if (resolve->res_status_ipv6 != RES_STATUS_INFLIGHT) return; - if (dns_result == DNS_ERR_NONE && answer_addr) { - tor_assert(tor_addr_family(answer_addr) == AF_INET6); + if (dns_result == DNS_ERR_NONE && answer_addr && + tor_addr_family(answer_addr) == AF_INET6) { memcpy(&resolve->result_ipv6.addr_ipv6, tor_addr_to_in6(answer_addr), sizeof(struct in6_addr));

1 0