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

[metrics-cloud/master] Adds development DNS zone
by irl＠torproject.org 13 Feb '20

13 Feb '20

commit 731d679fcebc7b5388b59c09a7c13eab623476c7 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 13 14:37:58 2020 +0000 Adds development DNS zone --- cloudformation/metrics-vpc.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/cloudformation/metrics-vpc.yml b/cloudformation/metrics-vpc.yml index c8def3f..97127f1 100644 --- a/cloudformation/metrics-vpc.yml +++ b/cloudformation/metrics-vpc.yml @@ -100,39 +100,50 @@ Resources: FromPort: 8080 ToPort: 8080 CidrIp: 0.0.0.0/0 + DevZone: + Type: "AWS::Route53::HostedZone" + Properties: + HostedZoneConfig: + Comment: 'DNS zone for development EC2 instances' + Name: 'tm-dev-aws.safemetrics.org' Outputs: VPC: Value: !Ref VPC Description: Tor Metrics VPC ID Export: - Name: !Sub MetricsVPC + Name: MetricsVPC Subnet: Value: !Ref Subnet Description: Tor Metrics Subnet ID Export: - Name: !Sub MetricsSubnet + Name: MetricsSubnet InternetSecurityGroup: Value: !Ref InternetSecurityGroup Description: Tor Metrics Internet Security Group ID Export: - Name: !Sub MetricsInternetSecurityGroup + Name: MetricsInternetSecurityGroup PingableSecurityGroup: Value: !Ref PingableSecurityGroup Description: Tor Metrics Pingable Security Group ID Export: - Name: !Sub MetricsPingableSecurityGroup + Name: MetricsPingableSecurityGroup HTTPSecurityGroup: Value: !Ref HTTPSecurityGroup Description: Tor Metrics HTTP Security Group ID Export: - Name: !Sub MetricsHTTPSecurityGroup + Name: MetricsHTTPSecurityGroup HTTPASecurityGroup: Value: !Ref HTTPASecurityGroup Description: Tor Metrics HTTPA Security Group ID Export: - Name: !Sub MetricsHTTPASecurityGroup + Name: MetricsHTTPASecurityGroup HTTPSSecurityGroup: Value: !Ref HTTPSSecurityGroup Description: Tor Metrics HTTPS Security Group ID Export: - Name: !Sub MetricsHTTPSSecurityGroup + Name: MetricsHTTPSSecurityGroup + DevZone: + Value: !Ref DevZone + Description: Tor Metrics Development DNS Zone + Export: + Name: MetricsDevZone

1 0

[metrics-cloud/master] cfn/onionperf: selection of ssh key based on aws iam user
by irl＠torproject.org 13 Feb '20

13 Feb '20

commit 8275a2466bc82c963d1c6e7c210746bc1cceecd6 Author: Ana Custura <ana(a)netstat.org.uk> Date: Sat Nov 23 19:05:55 2019 +0000 cfn/onionperf: selection of ssh key based on aws iam user --- cloudformation/identify_user.sh | 16 ++++++++++++++++ cloudformation/onionperf-dev.yml | 10 +++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/cloudformation/identify_user.sh b/cloudformation/identify_user.sh new file mode 100755 index 0000000..f01bbc5 --- /dev/null +++ b/cloudformation/identify_user.sh @@ -0,0 +1,16 @@ +#!/bin/zsh +#aws ec2 describe-key-pairs | jq -r '.KeyPairs[].KeyName' | grep `aws iam get-user | jq -r .User.UserName` +declare -A keypairs +keypairs[acute]="acute yubikey 4" +keypairs[irl]="irl macbook 16" +keypairs[karsten]="karsten's key" + +cur_user=$(aws iam get-user | jq -r .User.UserName) + +for key val in ${(kv)keypairs}; do + if [ $key = $cur_user ]; then + echo $val; + break + fi +done + diff --git a/cloudformation/onionperf-dev.yml b/cloudformation/onionperf-dev.yml index df77c19..6ac711c 100644 --- a/cloudformation/onionperf-dev.yml +++ b/cloudformation/onionperf-dev.yml @@ -1,9 +1,12 @@ --- # CloudFormation Stack for OnionPerf development instance # This stack will only deploy on us-east-1 and will deploy in the Metrics VPC -# TODO: Generalise the SSH key to use -# aws cloudformation deploy --region us-east-1 --stack-name `whoami`-onionperf-dev --template-file onionperf-dev.yml +# aws cloudformation deploy --region us-east-1 --stack-name `whoami`-onionperf-dev --parameter-overrides myKeyPair="$(./identify_user.sh)" --template-file onionperf-dev.yml AWSTemplateFormatVersion: 2010-09-09 +Parameters: + myKeyPair: + Description: Amazon EC2 Key Pair + Type: "AWS::EC2::KeyPair::KeyName" Resources: Instance: Type: AWS::EC2::Instance @@ -13,7 +16,8 @@ Resources: InstanceType: t2.micro SubnetId: Fn::ImportValue: !Sub 'MetricsSubnet' - KeyName: "irl yubikey 4" + KeyName: + Ref: myKeyPair SecurityGroupIds: - Fn::ImportValue: !Sub 'MetricsInternetSecurityGroup' - Fn::ImportValue: !Sub 'MetricsPingableSecurityGroup'

1 0

[metrics-cloud/master] ansible/tor-client: Ensure GPG is installed before using apt-key
by irl＠torproject.org 13 Feb '20

13 Feb '20

commit bfff037ea868c4d423e753903419d7a5253d7acf Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 13 14:38:46 2020 +0000 ansible/tor-client: Ensure GPG is installed before using apt-key --- ansible/roles/tor-client/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/tor-client/tasks/main.yml b/ansible/roles/tor-client/tasks/main.yml index 6c26428..8b6ee47 100644 --- a/ansible/roles/tor-client/tasks/main.yml +++ b/ansible/roles/tor-client/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: install gpg + apt: + pkg: + - gnupg2 + update_cache: yes + become: true - name: include deb.torproject.org apt key apt_key: url: https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…

1 0

[sbws/maint-1.1] fix: relaylist: linter error after after merge
by juga＠torproject.org 13 Feb '20

13 Feb '20

commit b6480a28244c8e486e0c927121b10b88d8275b24 Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:31:52 2020 +0000 fix: relaylist: linter error after after merge Fix linter error after merging #30733 and #30727. Closes: #33199. --- sbws/lib/relaylist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 8069854..65ec526 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -294,6 +294,7 @@ class Relay: measurement period. """ return timestamp.is_old(self.last_consensus_timestamp) + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last # descriptors seen for this relay and the timestamp. def update_server_descriptor(self, server_descriptor):

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 13 Feb '20

13 Feb '20

commit 44ece919978ba581415ebeb2f03a3f56ef3565ca Merge: 0b0dfe8 b6480a2 Author: juga0 <juga(a)riseup.net> Date: Thu Feb 13 13:18:40 2020 +0000 Merge branch 'maint-1.1' sbws/lib/relaylist.py | 1 + 1 file changed, 1 insertion(+)

1 0

[sbws/master] fix: relaylist: linter error after after merge
by juga＠torproject.org 13 Feb '20

13 Feb '20

commit b6480a28244c8e486e0c927121b10b88d8275b24 Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:31:52 2020 +0000 fix: relaylist: linter error after after merge Fix linter error after merging #30733 and #30727. Closes: #33199. --- sbws/lib/relaylist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 8069854..65ec526 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -294,6 +294,7 @@ class Relay: measurement period. """ return timestamp.is_old(self.last_consensus_timestamp) + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last # descriptors seen for this relay and the timestamp. def update_server_descriptor(self, server_descriptor):

1 0

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

13 Feb '20

commit bd75b88eafcdba495214291a179ca9036d98c7cd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 11:23:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 7b5e0f47ce..590e42889e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -6,12 +6,12 @@ # Anais Huang <1299820931(a)qq.com>, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 # erinm, 2019 -# ff98sha, 2019 # YFdyh000 <yfdyh000(a)gmail.com>, 2019 # shenzhui007 <12231252(a)bjtu.edu.cn>, 2019 # Emma Peel, 2020 # AngelFalse, 2020 # Cloud P <heige.pcloud(a)outlook.com>, 2020 +# ff98sha, 2020 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-20 16:43+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 2020\n" +"Last-Translator: ff98sha, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -323,7 +323,7 @@ msgid "" "deanonymize you." msgstr "" "Tor 浏览器已经预先安装了两个拓展插件——[HTTPS Everywhere](https://www.eff.org/https-" -"everywhere) 与[NoScript](https://noscript.net)——并且安装其他插件可能使您失去匿名状态。" +"everywhere) 与 [NoScript](https://noscript.net)——并且安装其他插件可能使您失去匿名状态。" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -396,7 +396,9 @@ msgid "" "You can find more detailed information about Tor + VPN at [our " "wiki](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN)." msgstr "" -"您可以在[我们的Wiki上](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN…" +"您可以在[我们的 Wiki " +"上](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN)找到更多有关 Tor 与" +" VPN 一起使用时的信息。" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) @@ -870,21 +872,21 @@ msgstr "" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "This set of volunteer relays is called the Tor network." -msgstr "这些由志愿者搭建的中继被成为Tor 网络。" +msgstr "这些由志愿者搭建的中继被成为 Tor 网络。" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "" "The way most people use Tor is with Tor Browser, which is a version of " "Firefox that fixes many privacy issues." -msgstr "大多数人通过Tor 浏览器使用Tor。Tor 浏览器基于火狐浏览器开发，并修复了许多隐私问题。" +msgstr "大多数人通过 Tor 浏览器使用 Tor。Tor 浏览器基于火狐浏览器开发，并修复了许多隐私问题。" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "" "You can read more about Tor on our " "[about](https://www.torproject.org/about/history/) page." -msgstr "您可以在我们的[关于页面](https://www.torproject.org/about/history/) 了解更多。" +msgstr "您可以在我们的[关于页面](https://www.torproject.org/about/history/)了解更多信息。" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -918,7 +920,7 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" -"即使洋葱路由已经成为了一个标准的家庭条款，Tor诞生于实际的由Naval研究实验室运行的[洋葱路由项目](https://www.onion-" +"即使洋葱路由已经成为了一个标准的家庭条款，Tor 诞生于实际的由 Naval 研究实验室运行的[洋葱路由项目](https://www.onion-" "router.net/)之外。" #: https//support.torproject.org/about/why-is-it-called-tor/ @@ -944,7 +946,8 @@ msgid "" "In fact, we can usually spot people who haven't read any of our website (and" " have instead learned everything they know about Tor from news articles) by " "the fact that they spell it wrong." -msgstr "实际上，我们常常会发现一些没有读过我们网站的人（而是从新闻报道中了解了他们对Tor的一切知识）正在使用我们的服务，因为他们将其拼写错误。" +msgstr "" +"实际上，我们常常会发现一些没有读过我们网站的人（而是从新闻报道中了解了他们对 Tor 的一切知识）正在使用我们的服务，因为他们将其拼写错误。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) @@ -1259,7 +1262,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" -msgstr "### 解决饭干（使用公钥）" +msgstr "### 更多操作（使用公钥）" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1291,7 +1294,7 @@ msgstr "你也许会想了解[更多关于GnuPG](https://www.gnupg.org/documenta #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.title) msgid "What are grey bars on resized Tor Browser window?" -msgstr "在Tor 浏览器窗口上的灰色滚动条是什么？" +msgstr "在 Tor 浏览器窗口上的灰色滚动条是什么？" #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -1299,7 +1302,7 @@ msgid "" "Tor Browser in its default mode is starting with a content window rounded to" " a multiple of 200px x 100px to prevent fingerprinting the screen " "dimensions." -msgstr "默认模式下Tor 浏览器大致用200px x 100px的倍数来打开一个新的窗口以避免屏幕尺寸留下的指纹。" +msgstr "默认模式下 Tor 浏览器大致用200px x 100px的倍数来打开一个新的窗口以避免屏幕尺寸留下的指纹。" #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -1865,7 +1868,7 @@ msgstr "Tor 浏览器使用什么搜索引擎，它是如何保护我的隐私 msgid "" "[DuckDuckGo](https://duckduckgo.com/) is the default search engine in Tor " "Browser." -msgstr "[DuckDuckGo](https://duckduckgo.com/)是Tor 浏览器的默认搜索引擎。" +msgstr "[DuckDuckGo](https://duckduckgo.com/) 是 Tor 浏览器的默认搜索引擎。" #: https//support.torproject.org/tbb/tbb-23/ #: (content/tbb/tbb-23/contents+en.lrquestion.description) @@ -1874,7 +1877,8 @@ msgid "" "searches. Learn more about [DuckDuckGo privacy " "policy](https://duckduckgo.com/privacy)." msgstr "" -"DuckDuckGo既不追踪用户，也不存储用户的任何搜索信息。了解更多关于[DuckDuckGo隐私政策](https://duckduckgo.co…" +"DuckDuckGo 既不追踪用户，也不存储用户的任何搜索信息。了解更多关于 [DuckDuckGo " +"隐私政策](https://duckduckgo.com/privacy)。" #: https//support.torproject.org/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.title) @@ -1884,7 +1888,7 @@ msgstr "我使用 DuckDuckGo 时遇到了问题。" #: https//support.torproject.org/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.description) msgid "Please see the [DuckDuckGo support portal](https://duck.co/help)." -msgstr "请查阅[DuckDuckGo 支持门户](https://duck.co/help)。" +msgstr "请查阅 [DuckDuckGo 支持门户](https://duck.co/help)。" #: https//support.torproject.org/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.description) @@ -1895,7 +1899,7 @@ msgstr "请查阅[DuckDuckGo 支持门户](https://duck.co/help)。" msgid "" "If you believe this is a Tor Browser issue, please report it on our [bug " "tracker](https://trac.torproject.org/)." -msgstr "如果您认为这是Tor 浏览器的问题，请向我们的[漏洞追踪器](https://trac.torproject.org/)汇报。" +msgstr "如果您认为这是 Tor 浏览器的问题，请向我们的[漏洞追踪器](https://trac.torproject.org/)汇报。" #: https//support.torproject.org/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.title) @@ -1905,7 +1909,7 @@ msgstr "我遇到 NoScript 的使用问题。" #: https//support.torproject.org/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.description) msgid "Please see the [NoScript FAQ](https://noscript.net/faq)." -msgstr "请查阅[NoScript 常见问题](https://noscript.net/faq)." +msgstr "请查阅 [NoScript 常见问题](https://noscript.net/faq)." #: https//support.torproject.org/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.title) @@ -1917,7 +1921,8 @@ msgstr "我遇到 HTTPS Everywhere 的使用问题。" msgid "" "Please see the [HTTPS Everywhere FAQ](https://www.eff.org/https-" "everywhere/faq)." -msgstr "请查阅[HTTPS Everywhere 常见问题](https://www.eff.org/https-everywhere/faq)." +msgstr "" +"请查阅 [HTTPS Everywhere 常见问题](https://www.eff.org/https-everywhere/faq)." #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.title) @@ -1929,7 +1934,7 @@ msgstr "我如何更新 Tor 浏览器?" msgid "" "Please see the [Updating section](https://tb-" "manual.torproject.org/updating/) in the Tor Browser Manual." -msgstr "请查阅Tor 浏览器手册中的[更新部分](https://tb-manual.torproject.org/updating/)。" +msgstr "请查阅 Tor 浏览器手册中的[更新部分](https://tb-manual.torproject.org/updating/)。" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -2168,7 +2173,7 @@ msgstr "" msgid "" "For users who want to have JavaScript disabled on all HTTP sites by default," " we recommend changing your Tor Browser's \"Security Level\" option." -msgstr "对于想要在所有的HTTP网站上默认关闭Javascript的用户，我们坚已您更改Tor 浏览器中“安全等级“的选项。" +msgstr "对于想要在所有的 HTTP 网站上默认关闭 Javascript 的用户，我们坚已您更改 Tor 浏览器中“安全等级“的选项。" #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description)

1 0

[translation/torbutton-branddtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd
by translation＠torproject.org 13 Feb '20

13 Feb '20

commit 474fe05f5f423b7cf066649c76387cd18b0efdff Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 10:21:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd --- hi/brand.dtd | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hi/brand.dtd b/hi/brand.dtd deleted file mode 100644 index 94acca6fd3..0000000000 --- a/hi/brand.dtd +++ /dev/null @@ -1,15 +0,0 @@ - - -<!ENTITY brandShorterName "टॉर विचरक"> -<!ENTITY brandShortName "टॉर ब्राउज़र"> -<!ENTITY brandFullName "टॉर विचरक"> -<!ENTITY vendorShortName "टोर परियोजना"> -<!ENTITY trademarkInfo.part1 "'Tor' और 'Onion Logo' टोर प्रोजेक्ट, इंक के पंजीकृत ट्रेडमार्क हैं |"> - - -<!ENTITY plugins.installed.find "स्थापित सिस्टम प्लगइन्स लोड करने के लिए क्लिक करें"> -<!ENTITY plugins.installed.enable "प्लगइन्स सक्षम करें"> -<!ENTITY plugins.installed.disable "प्लगइन्स अक्षम करें"> -<!ENTITY plugins.installed.disable.tip "सिस्टम प्लगइन्स की लोडिंग को रोकने के लिए क्लिक करें">

1 0

[translation/torbutton-branddtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd
by translation＠torproject.org 13 Feb '20

13 Feb '20

commit 648f1c4f2a63b500a0bcae5acaa32018c230011b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 09:51:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd --- hi-IN/brand.dtd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hi-IN/brand.dtd b/hi-IN/brand.dtd new file mode 100644 index 0000000000..94acca6fd3 --- /dev/null +++ b/hi-IN/brand.dtd @@ -0,0 +1,15 @@ + + +<!ENTITY brandShorterName "टॉर विचरक"> +<!ENTITY brandShortName "टॉर ब्राउज़र"> +<!ENTITY brandFullName "टॉर विचरक"> +<!ENTITY vendorShortName "टोर परियोजना"> +<!ENTITY trademarkInfo.part1 "'Tor' और 'Onion Logo' टोर प्रोजेक्ट, इंक के पंजीकृत ट्रेडमार्क हैं |"> + + +<!ENTITY plugins.installed.find "स्थापित सिस्टम प्लगइन्स लोड करने के लिए क्लिक करें"> +<!ENTITY plugins.installed.enable "प्लगइन्स सक्षम करें"> +<!ENTITY plugins.installed.disable "प्लगइन्स अक्षम करें"> +<!ENTITY plugins.installed.disable.tip "सिस्टम प्लगइन्स की लोडिंग को रोकने के लिए क्लिक करें">

1 0

[chutney/master] Ticket 33304 - Return None for pid when pid file is empty
by teor＠torproject.org 13 Feb '20

13 Feb '20

commit 185852f602ccd9168d7b7d5d13ad060feaa7a57d Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Wed Feb 12 23:59:47 2020 -0500 Ticket 33304 - Return None for pid when pid file is empty --- lib/chutney/TorNet.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 47b8e84..6f4041a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -863,7 +863,10 @@ class LocalNodeController(NodeController): return None with open(pidfile, 'r') as f: - return int(f.read()) + try: + return int(f.read()) + except ValueError: + return None def isRunning(self, pid=None): """Return true iff this node is running. (If 'pid' is provided, we

1 0