tor-commits October 2017

tor-commits@lists.torproject.org

17 participants
2004 discussions

[collector/master] Handle bridge descriptors with unusual line order.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit a38f7c277142e5300f3d7f43567b38706d727010 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 25 17:29:40 2017 +0200 Handle bridge descriptors with unusual line order. Typically, the "published" line appears before the "fingerprint" line. However, an alternative Tor implementation orders these two lines differently, which is valid due to the spec. We need to handle this case by accepting lines in either order. Fixes #23981. --- .../bridgedescs/SanitizedBridgesWriter.java | 77 +++++++++++++++++----- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index f53a3d1..441eb01 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -679,6 +679,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { new String(data, "US-ASCII"))); StringBuilder scrubbed = new StringBuilder(); String line = null; + byte[] fingerprintBytes = null; String hashedBridgeIdentity = null; String address = null; String routerLine = null; @@ -734,6 +735,20 @@ public class SanitizedBridgesWriter extends CollecTorMain { this.haveWarnedAboutInterval = true; } } + if (null != fingerprintBytes) { + /* We have read both published and fingerprint lines that we need to + * scrub the bridge's address which we might need to scrub reject + * lines. */ + try { + scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, + published); + } catch (IOException e) { + /* There's a persistence problem, so we shouldn't scrub more + * IP addresses in this execution. */ + this.persistenceProblemWithSecrets = true; + return; + } + } scrubbed.append(line + "\n"); /* Parse the fingerprint to determine the hashed bridge @@ -743,13 +758,51 @@ public class SanitizedBridgesWriter extends CollecTorMain { String fingerprint = line.substring(line.startsWith("opt ") ? "opt fingerprint".length() : "fingerprint".length()) .replaceAll(" ", "").toLowerCase(); - byte[] fingerprintBytes = Hex.decodeHex( - fingerprint.toCharArray()); + fingerprintBytes = Hex.decodeHex(fingerprint.toCharArray()); hashedBridgeIdentity = DigestUtils.sha1Hex(fingerprintBytes) .toLowerCase(); + if (null != published) { + /* We have read both published and fingerprint lines that we need to + * scrub the bridge's address which we might need to scrub reject + * lines. */ + try { + scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, + published); + } catch (IOException e) { + /* There's a persistence problem, so we shouldn't scrub more + * IP addresses in this execution. */ + this.persistenceProblemWithSecrets = true; + return; + } + } + scrubbed.append((line.startsWith("opt ") ? "opt " : "") + + "fingerprint"); + for (int i = 0; i < hashedBridgeIdentity.length() / 4; i++) { + scrubbed.append(" " + hashedBridgeIdentity.substring(4 * i, + 4 * (i + 1)).toUpperCase()); + } + scrubbed.append("\n"); + + /* Replace the contact line (if present) with a generic one. */ + } else if (line.startsWith("contact ")) { + scrubbed.append("contact somebody\n"); + + /* When we reach the signature, we're done. Write the sanitized + * descriptor to disk below. */ + } else if (line.startsWith("router-signature")) { + + /* Write the scrubbed "router" line now based on the "router", + * "fingerprint", and "published" lines that we read before. Also + * scrub any "or-address" lines. */ + if (null == routerLine || null == fingerprintBytes + || null == published) { + logger.warn("Missing either of the following lines that are " + + "required to sanitize this server bridge descriptor: " + + "\"router\", \"fingerprint\", \"published\". Skipping " + + "descriptor."); + return; + } try { - scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, - published); if (orAddresses != null) { scrubbedOrAddresses = new ArrayList<>(); for (String orAddress : orAddresses) { @@ -781,21 +834,9 @@ public class SanitizedBridgesWriter extends CollecTorMain { this.persistenceProblemWithSecrets = true; return; } - scrubbed.append((line.startsWith("opt ") ? "opt " : "") - + "fingerprint"); - for (int i = 0; i < hashedBridgeIdentity.length() / 4; i++) { - scrubbed.append(" " + hashedBridgeIdentity.substring(4 * i, - 4 * (i + 1)).toUpperCase()); - } - scrubbed.append("\n"); - /* Replace the contact line (if present) with a generic one. */ - } else if (line.startsWith("contact ")) { - scrubbed.append("contact somebody\n"); - - /* When we reach the signature, we're done. Write the sanitized - * descriptor to disk below. */ - } else if (line.startsWith("router-signature")) { + /* Put together the scrubbed descriptor from "router" to the newline + * before the original "router-signature" line. */ scrubbedDesc = scrubbedRouterLine; if (scrubbedOrAddresses != null) { for (String scrubbedOrAddress : scrubbedOrAddresses) {

1 0

[collector/master] Prepare for 1.4.1 release.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 56a303ecdb9c7f12fe117731a5511667e9763d31 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 25 20:51:30 2017 +0200 Prepare for 1.4.1 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c4f4bd0..fb87709 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.4.0-dev" /> + <property name="release.version" value="1.4.1" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.1.1" />

1 0

[collector/master] Update metrics-base.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 3a0ba1baba1e77780803a7ed0559be122a6f01b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 25 20:50:00 2017 +0200 Update metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 78e533f..4b34756 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc +Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Oct '17

26 Oct '17

commit 76330218fd530f68e8fd619c75d5fa05dfa2bc08 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 26 07:51:06 2017 +0000 Update translations for tor-browser-manual --- nl/nl.po | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nl/nl.po b/nl/nl.po index d7c77a2f7..77f080e8b 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -1055,6 +1055,9 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Net gelijk elk andere website, zult u het adres van de onion service moeten " +"weten voordat u ermee kan verbinden. Een onion adres is een string van 16 " +"meestal random letters en cijfers, gevolgd bij \".onion\"." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" @@ -1066,6 +1069,9 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Als u niet kan verbinden met de onion service die u wenst, zorg ervoor dat u" +" het 16 teken onion adres correct hebt ingevoerd: zelfs een kleinste fout " +"zal Tor Browser stoppen van het verbinden met de site." #: onionsites.page:64 msgid "" @@ -1073,6 +1079,10 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" +"Als u nog steeds niet kunt verbinden met de onion service, probeer dan op " +"een later moment opnieuw. Er zouden tijdelijke verbindings problemen kunnen " +"zijn, of de site beheerders hebben de site offline gehaald zonder het te " +"laten weten." #: onionsites.page:69 msgid "" @@ -1080,6 +1090,9 @@ msgid "" "connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's " "Onion Service</link>" msgstr "" +"U kunt alsook verbinden met andere onion services door te verbinden met " +"<link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion " +"Service</link>" #: plugins.page:6 msgid "How Tor Browser handles add-ons, plugins and JavaScript" @@ -1102,6 +1115,13 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" +"Video websites, zoals Vimeo maken gebruik van Flash Player plugin om video " +"inhoud te weergeven. Helaas werkt deze software onafhankelijk van Tor " +"Browser en kan niet gemakkelijk verplicht worden Tor Browser's proxy " +"instellingen te gebruiken. Daardoor kan het gemakkelijk uw echte locatie en " +"IP adres aan de website beheerders, of naar een buitenstaande waarnemer " +"onthullen. Voor deze reden is Flash standaard gedeactiveerd in Tor Browser, " +"en wordt het inschakelen afgeraden. " #: plugins.page:23 msgid "" @@ -1124,6 +1144,10 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"JavaScript is een programmeer taal die websites gebruiken om interactive " +"elementen zoals video, animatie, audio, en status tijdlijnen aan te bieden. " +"Helaas kan JavaScript ook aanvallen op de beveiliging van de browser " +"toelaten, die tot de-anonimisatie kunnen lijden." #: plugins.page:39 msgid "" @@ -1131,6 +1155,10 @@ msgid "" "icon at the top-left of the window, which allows you to control the " "JavaScript that runs on individual web pages, or to block it entirely." msgstr "" +"Tor Browser omvat een add-on genaamd NoScript, toegankelijk via het \"S\" " +"icoon in de linker boven hoek van het venster, die u toelaat het JavaScript " +"te controleren dat wordt uitgevoerd op individuele pagina's, of om het " +"volledig te blokkeren." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Oct '17

26 Oct '17

commit 12281179dc27a4c155a6dd219f99af9056753073 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 26 07:45:54 2017 +0000 Update translations for https_everywhere_completed --- ar/https-everywhere.dtd | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index 59d341d10..b7f2e7a39 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -2,42 +2,22 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "شفر شبكة الإنترنت! استخدم تلقائيا تقنية HTTPS للأمان مع الكثير من المواقع."> <!ENTITY https-everywhere.about.version "النسخة"> -<!ENTITY https-everywhere.about.created_by "أنشأه"> -<!ENTITY https-everywhere.about.and "، ايضاً"> -<!ENTITY https-everywhere.about.librarians "جامعيْ القواعد"> <!ENTITY https-everywhere.about.add_new_rule "اضافة قانون جديد"> -<!ENTITY https-everywhere.about.thanks "شكراً لكل من"> -<!ENTITY https-everywhere.about.many_contributors "والعديد العديد من المساهمين، شاملا"> -<!ENTITY https-everywhere.about.noscript "وايضا، جزئ من HTTPS Everywhere متمركزه على شفره NoScript، من صنع جورجيو ماوون وآخرين. نشكرهم على عملهم المتقن."> -<!ENTITY https-everywhere.about.contribute "إن أعجبتك إضافة HTTPS Everywhere، فكر بـ"> -<!ENTITY https-everywhere.about.donate_tor "التبرع لتور"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.or "أو"> -<!ENTITY https-everywhere.about.donate_eff "التبرع للـ EFF"> <!ENTITY https-everywhere.menu.donate_eff_imperative "تبرع لإي إف إف "> -<!ENTITY https-everywhere.menu.about "عن HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "خيارات مرصد SSL"> <!ENTITY https-everywhere.menu.globalEnable "فعّل HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "عطّل HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "منع جميع الطلبات الغير مشفرة"> <!ENTITY https-everywhere.menu.showCounter "أظهر العداد"> <!ENTITY https-everywhere.menu.viewAllRules "عرض جميع القواعد"> -<!ENTITY https-everywhere.prefs.title "خيارات HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "فعّل الكل"> -<!ENTITY https-everywhere.prefs.disable_all "عطّل الكل"> +<!ENTITY https-everywhere.options.generalSettings "الإعدادات العامّة"> +<!ENTITY https-everywhere.options.importSettings "استيراد اﻹعدادات"> +<!ENTITY https-everywhere.options.import "إستيراد"> +<!ENTITY https-everywhere.options.imported "تم إستيراد الاعدادت الخاصة بك"> + +<!ENTITY https-everywhere.prefs.export_settings "تصدير اﻹعدادات"> <!ENTITY https-everywhere.prefs.reset_defaults "استعادة الإعدادات الافتراضية"> -<!ENTITY https-everywhere.prefs.search "بحث"> -<!ENTITY https-everywhere.prefs.site "موقع"> -<!ENTITY https-everywhere.prefs.notes "ملاحظات"> -<!ENTITY https-everywhere.prefs.list_caption "أي من قواعد إعادة توجيه HTTPS يجب أن تطبق؟"> -<!ENTITY https-everywhere.prefs.enabled "مفعّل"> -<!ENTITY https-everywhere.prefs.ruleset_howto "يمكنك تعلم كيفية كتابة قواعد خاصة بك (لإضافة الدعم لمواقع أخرى)"> -<!ENTITY https-everywhere.prefs.here_link "هنا"> -<!ENTITY https-everywhere.prefs.toggle "بدّل"> -<!ENTITY https-everywhere.prefs.reset_default "استعادة الإعداد الافتراضي"> -<!ENTITY https-everywhere.prefs.view_xml_source "افحص مصدر XML"> <!ENTITY https-everywhere.chrome.stable_rules "قوانين متوازنة."> <!ENTITY https-everywhere.chrome.stable_rules_description "اجبار المواقع التالية بالقيام باتصالات مشفرة:"> @@ -53,5 +33,3 @@ <!ENTITY https-everywhere.chrome.regex "مطابقة regex"> <!ENTITY https-everywhere.chrome.redirect_to "اعادة التوجيه لـ"> <!ENTITY https-everywhere.chrome.status_cancel_button "إلغاء"> - -

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Oct '17

26 Oct '17

commit 22ba88a1027452c391f0607a36cb5409eb200143 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 26 07:45:43 2017 +0000 Update translations for https_everywhere --- ar/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index bb300e847..b7f2e7a39 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -11,12 +11,12 @@ <!ENTITY https-everywhere.menu.showCounter "أظهر العداد"> <!ENTITY https-everywhere.menu.viewAllRules "عرض جميع القواعد"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> +<!ENTITY https-everywhere.options.generalSettings "الإعدادات العامّة"> +<!ENTITY https-everywhere.options.importSettings "استيراد اﻹعدادات"> <!ENTITY https-everywhere.options.import "إستيراد"> <!ENTITY https-everywhere.options.imported "تم إستيراد الاعدادت الخاصة بك"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "تصدير اﻹعدادات"> <!ENTITY https-everywhere.prefs.reset_defaults "استعادة الإعدادات الافتراضية"> <!ENTITY https-everywhere.chrome.stable_rules "قوانين متوازنة.">

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Oct '17

26 Oct '17

commit 5f7ef1e0dd0f0dd21abc9d6a6a71af78bcac2cd6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 26 07:20:56 2017 +0000 Update translations for tor-browser-manual --- nl/nl.po | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/nl/nl.po b/nl/nl.po index af2713c85..d7c77a2f7 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -898,6 +898,13 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"Tor Browser laat het vaak lijken alsof u verbinding komt van een helemaal " +"verschillend deel van de wereld. Sommige websites zoals banken of email " +"providers, zullen dit dan misschien interpreteren als een teken dat uw " +"account misschien is gehackt of aangetast, en zullen u dan uw toegang " +"ontzeggen. De enige manier om dit op te lossen is de sites aanbevolen " +"procedure voor account recovery volgen, of de beheerders contacteren en de " +"situatie uitleggen." #: managing-identities.page:101 msgid "Changing identities and circuits" @@ -921,6 +928,8 @@ msgid "" "Tor Browser features “New Identity” and “New Tor Circuit for this Site” " "options, located in the Torbutton menu." msgstr "" +"Tor Browsers features \"Nieuwe Identiteit\" en \"Nieuw Tor Circuit voor deze" +" Site\" opties, deze vind u terug in het Torbutton menu." #: managing-identities.page:111 msgid "New Identity" @@ -935,6 +944,13 @@ msgid "" "connections. Tor Browser will warn you that all activity and downloads will " "be stopped, so take this into account before clicking “New Identity”." msgstr "" +"Deze optie is handig als u wilt voorkomen dat uw hierop volgende browser " +"activiteit gelinkt kan worden aan wat u hiervoor aan het doen was. Als u " +"hiervoor kiest, zullen al uw tabladen en vensters gesloten worden, al uw " +"persoonlijk informatie zoals cookies en geschiedenis wissen, en nieuwe Tor " +"circuits voor alle verbindingen gebruiken. Tor Browser zal uw waarschuwen " +"dat alle activiteit en downloads gestopt zullen worden, houd hier dus " +"rekening mee voor dat u klikt op \"Nieuwe Identiteit\"." #: managing-identities.page:123 msgid "New Tor Circuit for this Site" @@ -951,10 +967,19 @@ msgid "" "or unlink your activity, nor does it affect your current connections to " "other websites." msgstr "" +"Deze optie is handig als de <link xref=\"about-tor-browser#how-tor-" +"works\">exit relay</link> die u gebruikt niet instaat is om de verbinden met" +" de website die u wenst, of niet laad zoals hij hoort. Voor deze optie " +"kiezen zal ervoor zorgen dat het huidige tablad of venster zal herladen " +"worden over een nieuw Tor circuit. Andere geopende tabs en vensters van " +"dezelfde website zullen ook een nieuw Tor circuit gebruiken eens ze herladen" +" zijn. Deze optie verwijderd geen persoonlijke informatie, zal uw activiteit" +" niet ontkoppelen en zal ook niet uw huidige verbindingen naar andere " +"websites veranderen." #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Services die alleen toegankelijk zijn via Tor" #: onionsites.page:10 msgid "Onion Services" @@ -965,18 +990,25 @@ msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Onion services (voorheen bekend als \"hidden services\") zijn services " +"(zoals websites) die alleen toegankelijk zijn via het Tor netwerk." #: onionsites.page:16 msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" +"Onion services bieden verschillende voordelen aan vergeleken met gewone " +"services op het niet private web:" #: onionsites.page:23 msgid "" "An onion services’s location and IP address are hidden, making it difficult " "for adversaries to censor it or identify its operators." msgstr "" +"Een onion services zijn locatie en IP adres zijn verborgen, zodat het " +"moeilijk is voor tegenstanders om het te censureren of de beheerder te " +"identificeren." #: onionsites.page:29 msgid "" @@ -984,6 +1016,9 @@ msgid "" " you do not need to worry about <link xref=\"secure-connections\">connecting" " over HTTPS</link>." msgstr "" +"All het verkeer tussen Tor gebruikers en onion services gebruiken end-to-end" +" encryptie, dus u hoeft geen zorgen te maken over <link xref=\"secure-" +"connections\">verbinden over HTTPS</link>." #: onionsites.page:36 msgid "" @@ -992,6 +1027,10 @@ msgid "" " that it is connecting to the right location and that the connection is not " "being tampered with." msgstr "" +"Het adres van een onion service wordt automatisch gegenereerd, zodat de " +"beheerder geen domeinnaam hoeft te kopen; de .onion URL helpt Tor te " +"verzekeren dat de verbinding naar de juiste locatie gemaakt wordt en dat er " +"niet met de verbinding wordt geknoeid." #: onionsites.page:46 msgid "How to access an onion service"

1 0

[chutney/master] PredictedPortsRelevanceTime is obsolete, remove it from our torrcs
by teor＠torproject.org 26 Oct '17

26 Oct '17

commit 1bef522f0bbcb1713bb2f80bf4cb485742a45d89 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 26 14:34:17 2017 +1100 PredictedPortsRelevanceTime is obsolete, remove it from our torrcs Closes 24005. --- torrc_templates/single-onion.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/torrc_templates/single-onion.tmpl b/torrc_templates/single-onion.tmpl index f014d7a..2b266c8 100644 --- a/torrc_templates/single-onion.tmpl +++ b/torrc_templates/single-onion.tmpl @@ -17,6 +17,5 @@ Log notice [rend,bug]info file ${dir}/single-onion.log #__DisablePredictedCircuits 1 # A workaround is to set: LongLivedPorts -PredictedPortsRelevanceTime 0 seconds # This disables everything except hidden service preemptive 3-hop circuits. # See #17360.

1 0

[chutney/master] Put the --quiet option last on the tor command line
by teor＠torproject.org 26 Oct '17

26 Oct '17

commit 55450d524fb85a9f945d3cc8258bb7d09637ae71 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 26 14:23:11 2017 +1100 Put the --quiet option last on the tor command line This makes it easier to find out what went wrong when tor fails to launch. Implements 24003. --- lib/chutney/TorNet.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index d48f383..3e6da22 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -436,12 +436,13 @@ class LocalNodeBuilder(NodeBuilder): torrc = self._getTorrcFname() cmdline = [ tor, - "--quiet", "--ignore-missing-torrc", "-f", torrc, "--list-fingerprint", "--orport", "1", - "--datadirectory", datadir] + "--datadirectory", datadir, + "--quiet", + ] try: p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) except OSError as e: @@ -612,9 +613,9 @@ class LocalNodeController(NodeController): torrc = self._getTorrcFname() cmdline = [ tor_path, - "--quiet", "-f", torrc, - ] + "--quiet", + ] try: p = subprocess.Popen(cmdline) except OSError as e:

1 0

[nyx/master] Rename circuit exit to 'end'
by atagar＠torproject.org 25 Oct '17

25 Oct '17

commit d6a484fa8e8082a9505b9849b103675d7908f2fc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 25 13:07:06 2017 -0700 Rename circuit exit to 'end' Calling the endpoint of our own circuits 'exit' worries folks on occasion, concerned that they might accidently be running an exit relay. Renaming the termination point to 'end' to hopefully avoid those concerns... https://trac.torproject.org/projects/tor/ticket/12956 --- nyx/panel/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 3002d67..1a090ac 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -721,7 +721,7 @@ def _draw_right_column(subwindow, x, y, line, current_time, attr): circ_index = circ_path.index(line.fingerprint) if circ_index == len(circ_path) - 1: - placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' + placement_type = 'End' if line.circuit.status == 'BUILT' else 'Extending' elif circ_index == 0: placement_type = 'Guard' else:

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2017