April 2020 - tor-commits - lists.torproject.org

[community/master] Update Response template for Tor relay operator to ISP - 2020 edition
by gus＠torproject.org 21 Apr '20

21 Apr '20

commit cd10fedd51e66b005d8fe043821c4c8748d6fdc8 Author: gus <gus(a)torproject.org> Date: Tue Apr 21 13:00:53 2020 -0400 Update Response template for Tor relay operator to ISP - 2020 edition --- .../tor-dmca-response/contents.lr | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr index 1bbccb8..847ce19 100644 --- a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr +++ b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr @@ -6,15 +6,23 @@ title: Response template for Tor relay operator to ISP --- body: -Written by the Electronic Frontier Foundation ([EFF](https://www.eff.org/)) Last updated May 31, 2011. +Written by the Electronic Frontier Foundation ([EFF](https://www.eff.org/)) Last updated March 27, 2020. -Note to Tor relay operators: In this litigious era, anyone providing routing services may face copyright complaints for transmitted content. Fortunately, the Digital Millennium Copyright Act safe harbors should provide protections from many of them both to you and to your upstream provider. If your Internet host forwards a DMCA copyright complaint to you, you can use this template to write a response, though you will need to customize it to your situation. Please also ensure all the statements are true for you. (The Tor Project has an [abuse collection of templates](/relay/community-resources/tor-abuse-templates/) to help you respond to other types of abuse complaints, too.) Before sending any response to your ISP, you may want to seek the advice of an attorney licensed to practice in your jurisdiction. +Note to Tor relay operators: In this litigious era, anyone providing routing services may face copyright complaints for transmitted content. +Fortunately, copyright law should provide protections from many of them both to you and to your upstream provider. +If your Internet host forwards a copyright complaint to you, you can use this template to write a response, though you will need to customize it to your situation. +Please also ensure all the statements are true for you. +(The Tor Project has an [abuse collection of templates](/relay/community-resources/tor-abuse-templates/) to help you respond to other types of abuse complaints, too.) +Before sending any response to your ISP, you may want to seek the advice of an attorney licensed to practice in your jurisdiction. -This template letter is for informational purposes only and does not constitute legal advice. Whether and how you should respond when you or your ISP has received a DMCA notice will turn on the particular facts of your situation. This template is intended as a starting point, but you should tailor it to your own circumstances. In addition, it's up to you to comply with your ISP's terms of service. If you're not comfortable including so much legal explanation, feel free to invite the ISP to contact EFF for a fuller discussion. +This template letter is for informational purposes only and does not constitute legal advice. +Whether and how you should respond when you or your ISP has received a copyright notice will turn on the particular facts of your situation. +This template is intended as a starting point, but you should tailor it to your own circumstances. +In addition, it's up to you to comply with your ISP's terms of service. +If you're not comfortable including so much legal explanation, feel free to invite the ISP to contact EFF for a fuller discussion. -If you do not believe the safe harbors apply to your particular situation, don't use this template as a basis for your response. Specific information about safe harbor qualification for "transitory digital network communications" is provided on the Chilling Effects website [here](https://www.chillingeffects.org/dmca512/faq.cgi#QID586) and also in the template, below. - -Also, if you received this document from anywhere other than the EFF web site or [tor-dmca-response](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response), it may be out of date. Follow the link to get the latest version. +Also, if you received this document from anywhere other than the EFF web site or [tor-dmca-response](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response), it may be out of date. +Follow the link to get the latest version. ``` @@ -22,14 +30,13 @@ Dear [ISP]: Thank you for forwarding me the notice you received from [copyright claimant] regarding [content]. I would like to assure you that I am not hosting the claimed infringing materials, and furthermore, the Digital Millennium Copyright Act's ("DMCA") safe harbors likely protect you from liability arising from this complaint. The notice is likely based upon misunderstandings about the law and about some of the software I run. - -As you know, the DMCA creates four "safe harbors" for service providers to protect them from copyright liability for the acts of their users, when the ISPs fulfill certain requirements. (17 U.S.C. 512) The DMCA's requirements vary depending on the ISP's role. You may be familiar with the "notice and takedown" provisions of section 512(c) of the DMCA; however, those do not apply when an ISP merely acts as a conduit. Instead, the "conduit" safe harbor of section 512(a) of the DMCA has different and less burdensome eligibility requirements, as the D.C. Circuit Court of Appeals held in RIAA v. Verizon (see https://www.eff.org/sites/default/files/filenode/RIAA_v_Verizon/20030121-ri…) and the Eighth Circuit Court of Appeals confirmed in RIAA v. Charter (see https://w2.eff.org/IP/P2P/Charter/033802P.pdf) +As you know, the DMCA creates four "safe harbors" for service providers to protect them from copyright liability for the acts of their users, when the ISPs fulfill certain requirements. (17 U.S.C. 512) The DMCA's requirements vary depending on the ISP's role. You may be familiar with the "notice and takedown" provisions of section 512(c) of the DMCA; however, those do not apply when an ISP merely acts as a conduit. Instead, the "conduit" safe harbor of section 512(a) of the DMCA has different and less burdensome eligibility requirements, as the D.C. Circuit Court of Appeals held in RIAA v. Verizon (see https://scholar.google.com/scholar_case?case=15815830240179540527) and the Eighth Circuit Court of Appeals confirmed in RIAA v. Charter (see https://scholar.google.com/scholar_case?case=11547531128234336420) Under DMCA 512(a), service providers like you are typically protected from damages for copyright infringement claims if you also maintain "a policy that provides for termination in appropriate circumstances of subscribers and account holders of the service provider's system or network who are repeat infringers." If you have and implement such a policy, and you otherwise qualify for the safe harbor, you should be free from fear of copyright damages. -As for what makes a reasonable policy, as the law says, it's one that terminates subscribers who are repeat infringers. The notification you received is certainly not proof of the "repeat infringement" that is required under the law before you need to terminate my account. In fact, it's not even proof of any copyright infringement; a notice claiming infringement is not the same as a determination of infringement. I have not infringed any copyrights and do not intend to do so. Therefore, you should continue to be protected under the DMCA 512(a) safe harbor without taking any further action. +The copyright notice you received was likely triggered by a program I run called Tor. Tor is network software that helps users to enhance their privacy, security, and safety online. It does not host any content. Rather, it is part of a network of nodes on the Internet that simply pass packets among themselves before sending them to their destinations, just as any Internet intermediary does. The difference is that Tor tunnels the connections such that no hop can learn both the source and destination of the packets, giving users protection from nefarious snooping on network traffic. The result is that, unlike most other Internet traffic, the final IP address that the recipient receives is not the IP address of the sender. Tor protects users against hazards such as harassment, spam, and identity theft. Initial development of Tor, including deployment of a public-use Tor network, was a project of the U.S. Naval Research Laboratory, with funding from ONR and DARPA. (For more on Tor, see https://www.torproject.org/.) I hope, as an organization committed to protecting the privacy of its customers, you'll agree that this is a valuable technology. -You may be curious about what prompted the faulty notice. It was likely triggered by a program I run called Tor. Tor is network software that helps users to enhance their privacy, security, and safety online. It does not host any content. Rather, it is part of a network of nodes on the Internet that simply pass packets among themselves before sending them to their destinations, just as any Internet intermediary does. The difference is that Tor tunnels the connections such that no hop can learn both the source and destination of the packets, giving users protection from nefarious snooping on network traffic. The result is that, unlike most other Internet traffic, the final IP address that the recipient receives is not the IP address of the sender. Tor protects users against hazards such as harassment, spam, and identity theft. Initial development of Tor, including deployment of a public-use Tor network, was a project of the U.S. Naval Research Laboratory, with funding from ONR and DA RPA. (For more on Tor, see https://www.torproject.org/.) I hope, as an organization committed to protecting the privacy of its customers, you'll agree that this is a valuable technology. +While the Tor node that I run may appear to be the source of material that is alleged to be copyright-infringing, I do not host that material. I do not select the material transmitted through the Tor node that I run, and I have no practical means of either identifying the source of such material or preventing its transmission. I do nothing to encourage or promote the use of the Tor network for copyright infringement. For these reasons, I am not an infringer of copyright in any materials that are transmitted through the Tor node that I run, either directly or under a theory of contributory or vicarious liability. Therefore, you should continue to be protected under the DMCA 512(a) safe harbor without taking any further action. Thank you for working with me on this matter. As a loyal subscriber, I appreciate your notifying me of this issue and hope that the protections of DMCA 512 put any concerns you may have to rest. If not, please contact me with any further questions.

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 21 Apr '20

21 Apr '20

commit c242a4d68ec80e02a82b492feb936c9552dd9b10 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 21 16:51:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fa.po | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 9041792146..dce0574166 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -9,8 +9,8 @@ # AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020 # Emma Peel, 2020 # Seyyed Hossein Darvari <xhdix(a)yahoo.com>, 2020 -# Reza Ghasemi, 2020 # Samaneh M <asamana.haoma(a)gmail.com>, 2020 +# Reza Ghasemi, 2020 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Samaneh M <asamana.haoma(a)gmail.com>, 2020\n" +"Last-Translator: Reza Ghasemi, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,7 +88,7 @@ msgstr "◾️ دانلود مرورگر" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "اجرای مرورگر تور برای اولین بار" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -108,7 +108,7 @@ msgstr "◾️ پل ها" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "مدیریت هویت‌ها" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -157,7 +157,7 @@ msgstr "◾️ مشکلات شناخته شده" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.title) msgid "Mobile Tor" -msgstr "" +msgstr "تور موبایل" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -640,7 +640,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -686,12 +686,12 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If possible, ask your network administrator for guidance." -msgstr "" +msgstr "اگر ممکن است، از ادمین شبکه خود راهنمایی بخواهید." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If your connection does not use a proxy, click “Connect”." -msgstr "" +msgstr "اگر اتصال شما از پروکسی استفاده نمی کند، روی \"اتصال\" کلیک کنید." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) @@ -880,7 +880,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Your settings will automatically be saved once you close the tab." -msgstr "" +msgstr "تنظیمات شما به صورت خودکار بعد از بستن این زبانه ذخیره خواهند شد." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1019,6 +1019,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/request-a-bridge.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/request-a-bridge.png\">" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2323,7 +2325,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for Android" -msgstr "" +msgstr "### مرورگر تور برای اندروید" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2336,7 +2338,7 @@ msgstr "" #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "It is like the desktop Tor Browser, but for your Android mobile device." -msgstr "" +msgstr "مانند مرورگر تور دسکتاپ می باشد، ولی برای دستگاه اندروید شماست." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2380,7 +2382,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Google Play" -msgstr "" +msgstr "#### گوگل پلی" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2472,7 +2474,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### The Tor Project website" -msgstr "" +msgstr "#### سایت پروژه‌ی تور" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2498,7 +2500,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Connect" -msgstr "" +msgstr "#### اتصال" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2506,6 +2508,8 @@ msgid "" "<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" "/android-connect.png\" alt=\"Connect to Tor Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-connect.png\" alt=\"Connect to Tor Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2525,7 +2529,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Configure" -msgstr "" +msgstr "#### پیکربندی" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2533,6 +2537,8 @@ msgid "" "<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" "/android-configure.png\" alt=\"Configure Tor Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-configure.png\" alt=\"Configure Tor Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2608,6 +2614,9 @@ msgid "" "/android-censored.png\" alt=\"Censored internet on Tor Browser for " "Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-censored.png\" alt=\"Censored internet on Tor Browser for " +"Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2630,6 +2639,9 @@ msgid "" "/android-select-a-bridge.png\" alt=\"Select a bridge on Tor Browser for " "Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-select-a-bridge.png\" alt=\"Select a bridge on Tor Browser for " +"Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2638,6 +2650,9 @@ msgid "" "/android-selected-a-bridge.png\" alt=\"Selected a bridge on Tor Browser for " "Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-selected-a-bridge.png\" alt=\"Selected a bridge on Tor Browser for " +"Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2653,6 +2668,9 @@ msgid "" "/android-provide-a-bridge.png\" alt=\"Provide a bridge on Tor Browser for " "Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-provide-a-bridge.png\" alt=\"Provide a bridge on Tor Browser for " +"Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2661,6 +2679,9 @@ msgid "" "/android-provided-a-bridge.png\" alt=\"Provide brigde addresses on Tor " "Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-provided-a-bridge.png\" alt=\"Provide brigde addresses on Tor " +"Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[chutney/master] Fixed some syntax errors
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit e49c377029997c7a2a80fae9181464278dd44544 Author: MrSquanchee <usuraj35(a)gmail.com> Date: Thu Apr 16 12:00:58 2020 +0530 Fixed some syntax errors In Templating.py and TorNet.py --- lib/chutney/Templating.py | 2 +- lib/chutney/TorNet.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py index 2a658ab..43eb636 100755 --- a/lib/chutney/Templating.py +++ b/lib/chutney/Templating.py @@ -107,7 +107,7 @@ class _DictWrapper(object): self._parent = parent def _getitem(self, key, my): - raise NotImplemented() + raise NotImplementedError() def __getitem__(self, key): return self.lookup(key, self) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b68b240..6b5b88e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -67,7 +67,7 @@ def getenv_type(env_var, default, type_, type_name=None): type_name = str(type_) raise ValueError(("Invalid value for environment variable '{}': " "expected {}, but got '{}'") - .format(env_var, typename, strval)) + .format(env_var, type_name, strval)) def getenv_int(env_var, default): """ @@ -389,7 +389,7 @@ def get_tor_modules(tor): ] try: mods = run_tor(cmdline) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: # Tor doesn't support --list-modules; act as if it said nothing. mods = "" @@ -761,8 +761,8 @@ class LocalNodeBuilder(NodeBuilder): stdouterr = run_tor(cmdline) fingerprint = "".join((stdouterr.rstrip().split('\n')[-1]).split()[1:]) if not re.match(r'^[A-F0-9]{40}$', fingerprint): - print("Error when getting fingerprint using '%r'. It output '%r'." - .format(" ".join(cmdline), stdouterr)) + print("Error when getting fingerprint using '{0}'. It output '{1}'." + .format(repr(" ".join(cmdline)), repr(stdouterr))) sys.exit(1) self._env['fingerprint'] = fingerprint @@ -1757,7 +1757,7 @@ class LocalNodeController(NodeController): node_status = self.getNodeDirInfoStatus() if node_status: status_code, _, _, _ = node_status - return status_code == LocalDirectoryController.SUCCESS_CODE + return status_code == LocalNodeController.SUCCESS_CODE else: # Clients don't publish descriptors, so they are always ok. # (But we shouldn't print a descriptor status for them.) @@ -2020,7 +2020,7 @@ class Network(object): def _addRequirement(self, requirement): requirement = requirement.upper() if requirement not in KNOWN_REQUIREMENTS: - raise RuntimemeError(("Unrecognized requirement %r"%requirement)) + raise RuntimeError(("Unrecognized requirement %r"%requirement)) self._requirements.append(requirement) def move_aside_nodes_dir(self): @@ -2403,7 +2403,7 @@ class Network(object): c.stop(sig=sig) print("Waiting for nodes to finish.") wrote_dot = False - for n in range(15): + for _ in range(15): time.sleep(1) if all(not c.isRunning() for c in controllers): self.final_cleanup(wrote_dot,

1 0

[tor/release-0.4.3] channeltls: Stop truncating IPv6 in logs
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit 42507429ce45495667c3c334679425210a291226 Author: teor <teor(a)torproject.org> Date: Wed Apr 15 13:06:01 2020 +1000 channeltls: Stop truncating IPv6 in logs Stop truncating IPv6 addresses and ports in channel and connection logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. --- changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug33918 b/changes/bug33918 new file mode 100644 index 000000000..e1467b4aa --- /dev/null +++ b/changes/bug33918 @@ -0,0 +1,3 @@ + o Minor bugfixes (IPv6, logging): + - Stop truncating IPv6 addresses and ports in channel and connection logs. + Fixes bug 33918; bugfix on 0.2.4.4-alpha. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 7974da483..8112eb64e 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -563,7 +563,8 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { -#define MAX_DESCR_LEN 32 + /* IPv6 address, colon, port */ +#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) static char buf[MAX_DESCR_LEN + 1]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit b2849f449b2efa4d6826166a92f35c7627d65f91 Merge: e3b1e617a 42507429c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 21 12:22:37 2020 -0400 Merge branch 'maint-0.4.3' changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] channeltls: Stop truncating IPv6 in logs
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit 42507429ce45495667c3c334679425210a291226 Author: teor <teor(a)torproject.org> Date: Wed Apr 15 13:06:01 2020 +1000 channeltls: Stop truncating IPv6 in logs Stop truncating IPv6 addresses and ports in channel and connection logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. --- changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug33918 b/changes/bug33918 new file mode 100644 index 000000000..e1467b4aa --- /dev/null +++ b/changes/bug33918 @@ -0,0 +1,3 @@ + o Minor bugfixes (IPv6, logging): + - Stop truncating IPv6 addresses and ports in channel and connection logs. + Fixes bug 33918; bugfix on 0.2.4.4-alpha. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 7974da483..8112eb64e 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -563,7 +563,8 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { -#define MAX_DESCR_LEN 32 + /* IPv6 address, colon, port */ +#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) static char buf[MAX_DESCR_LEN + 1]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit a56d990fc45b0a32f7c9859f541b2f0d0e437ad8 Merge: 64e266b71 42507429c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 21 12:22:37 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] channeltls: Stop truncating IPv6 in logs
by nickm＠torproject.org 21 Apr '20

21 Apr '20

commit 42507429ce45495667c3c334679425210a291226 Author: teor <teor(a)torproject.org> Date: Wed Apr 15 13:06:01 2020 +1000 channeltls: Stop truncating IPv6 in logs Stop truncating IPv6 addresses and ports in channel and connection logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. --- changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug33918 b/changes/bug33918 new file mode 100644 index 000000000..e1467b4aa --- /dev/null +++ b/changes/bug33918 @@ -0,0 +1,3 @@ + o Minor bugfixes (IPv6, logging): + - Stop truncating IPv6 addresses and ports in channel and connection logs. + Fixes bug 33918; bugfix on 0.2.4.4-alpha. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 7974da483..8112eb64e 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -563,7 +563,8 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { -#define MAX_DESCR_LEN 32 + /* IPv6 address, colon, port */ +#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) static char buf[MAX_DESCR_LEN + 1]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 21 Apr '20

21 Apr '20

commit 883f0a9b6459113e925911329c14a4f5132f253f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 21 15:15:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+pl.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index 1c9267adff..56a81c0f3b 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -140,7 +140,7 @@ msgstr "" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.title) msgid "Training" -msgstr "" +msgstr "Szkolenia" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.subtitle) @@ -149,16 +149,17 @@ msgstr "" msgid "" "Do you teach your community about using Tor? These resources are for you." msgstr "" +"Czy uczysz swoją społeczność korzystania z Tor? Te zasoby są dla Ciebie." #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.cta) msgid "Check our resources" -msgstr "" +msgstr "Sprawdź nasze zasoby" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) msgid "## We want to teach the world about Tor. Can you help?" -msgstr "" +msgstr "## Chcemy uczyć świat o Tor. Możesz pomóc?" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) @@ -166,6 +167,8 @@ msgid "" "Are you a Tor trainer or interested in becoming one? Looking for resources " "to help your community learn the most about Tor? We've got you covered." msgstr "" +"Jesteś trenerem Tor lub chcesz zostać nim? Szukasz zasobów, które pomogą " +"Twojej społeczności dowiedzieć się jak najwięcej o Tor? Jesteśmy z Tobą." #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 21 Apr '20

21 Apr '20

commit 009bacb50b720e22c4ff0a7f5d052691357377f1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 21 14:57:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pl.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index 29412999c0..fa06a2e7c9 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -133,7 +133,7 @@ msgstr "Różne" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Get in Touch" -msgstr "" +msgstr "Skontaktuj się z nami" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) #: https//support.torproject.org/misc/menu/ @@ -227,6 +227,8 @@ msgid "" "A web application (web app), is an application that the [client](../client) " "runs in a [web browser](../web-browser)." msgstr "" +"Aplikacja sieci web (aplikacja internetowa) jest aplikacją, którą " +"[klient](../client) działa w [przeglądarce internetowej](../web-browser)." #: https//support.torproject.org/glossary/app/ #: (content/glossary/app/contents+en.lrword.definition) @@ -420,7 +422,7 @@ msgstr "" #: https//support.torproject.org/glossary/client/ #: (content/glossary/client/contents+en.lrword.term) msgid "client" -msgstr "" +msgstr "klient" #: https//support.torproject.org/glossary/client/ #: (content/glossary/client/contents+en.lrword.definition)

1 0