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

[tor-browser-build/master] Bug 31550: Put curly quotes inside single quotes, so shellcheck believes them
by boklm＠torproject.org 07 Oct '19

07 Oct '19

commit c14d73615ba8d9e12ae29f0168babc0ecbe55052 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 15:56:18 2019 -0400 Bug 31550: Put curly quotes inside single quotes, so shellcheck believes them If you don't take this approach with unicode curly quotes, shellcheck thinks that maybe you meant to use "" instead. --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 5cb94ef..1adad8f 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -296,7 +296,7 @@ function setControlPortPasswd() { TOR_CONTROL_PASSWD environment variable." echo "The Tor ControlPort password should be given inside double" echo "quotes, inside single quotes. That is, if the ControlPort" - echo "password is “secret” (without curly quotes) then we must" + echo 'password is “secret” (without curly quotes) then we must' echo "start this script after setting the environment variable" echo "exactly like this:" echo

1 0

[tor-browser-build/master] Bug 31550: Stop using a heredoc in start-tor-browser
by boklm＠torproject.org 07 Oct '19

07 Oct '19

commit c5f30eb31a39a61fe300389fff1ff7adecb8b163 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 15:52:01 2019 -0400 Bug 31550: Stop using a heredoc in start-tor-browser Fixes bug 24755. --- projects/tor-browser/RelativeLink/start-tor-browser | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 0a1dcbf..5cb94ef 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -294,16 +294,13 @@ function setControlPortPasswd() { else complain "There seems to have been a quoting problem with your \ TOR_CONTROL_PASSWD environment variable." - cat <<EOF - -The Tor ControlPort password should be given inside double quotes, inside single -quotes, i.e. if the ControlPort password is “secret” (without curly quotes) then -we must start this script after setting the environment variable exactly like -this: - - \$ TOR_CONTROL_PASSWD='"secret"' $myname - -EOF + echo "The Tor ControlPort password should be given inside double" + echo "quotes, inside single quotes. That is, if the ControlPort" + echo "password is “secret” (without curly quotes) then we must" + echo "start this script after setting the environment variable" + echo "exactly like this:" + echo + echo " \$ TOR_CONTROL_PASSWD='\"secret\"' $myname" fi }

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 7d317f57545a9c673b36648792b285e38c4fc105 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 15:22:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+zh-CN.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 54073fcc4..01f07fb80 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -511,6 +511,8 @@ msgid "" "mainstream concern thanks to the [Snowden revelations in " "2013](https://www.theguardian.com/us-news/the-nsa-files)." msgstr "" +"由于[2013年的斯诺登启示](https://www.theguardian.com/us-news/the-nsa-" +"files)，防止大规模监视的工具的需求成为主流关注点。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -632,7 +634,7 @@ msgstr "" #: https//www.torproject.org/about/trademark/trademark-faq/ #: (content/about/trademark/trademark-faq/contents+en.lrtopic.title) msgid "Tor Trademark Frequently Asked Questions" -msgstr "" +msgstr "Tor 商标常见问题。" #: lego/templates/footer.html:9 lego/templates/footer.html:18 #: lego/templates/navbar.html:73 templates/footer.html:9 @@ -701,7 +703,7 @@ msgstr "讨论 Tor 相关的代码和协议。欢迎提出看法。" #: templates/contact.html:11 msgid "Get in touch with other translators" -msgstr "" +msgstr "与其他的翻译者保持联络" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." @@ -710,7 +712,7 @@ msgstr "公开地观看或加入记录的团队会议。" #: templates/contact.html:13 msgid "" "Discuss organization and community related topics: meetups and outreach." -msgstr "" +msgstr "讨论与组织与社区相关的主题：聚会和拓展。" #: templates/contact.html:14 msgid "Discuss running a Tor relay." @@ -722,7 +724,7 @@ msgstr "与 Tor 的全球南方社区交谈。" #: templates/contact.html:16 msgid "Talk with us about improvements on our websites." -msgstr "" +msgstr "告诉我们如何改进我们的网站。" #: templates/contact.html:17 msgid "Discuss UX related ideas." @@ -827,7 +829,7 @@ msgstr "前往 Google Play" #: templates/download-android.html:26 msgid "Go to F-Droid" -msgstr "" +msgstr "前往 F-Droid" #: templates/download-android.html:36 msgid "Are you an iOS user? We encourage you to try Onion Browser." @@ -940,7 +942,7 @@ msgstr "下载其他语言或平台的版本" #: templates/hero-download.html:46 msgid "Download the latest alpha build" -msgstr "" +msgstr "下载最新的Alpha版本" #: templates/hero-download.html:50 msgid "Read the latest release announcements"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit bf68a0140dd10cfe18415f72b71c372dcd57691f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 15:22:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 4 ++-- contents+zh-CN.po | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index d8ecdba6c..6d89d3870 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -997,11 +997,11 @@ msgstr "Defenseu-vos contra el seguiment i la vigilància. Eludiu la censura." #: templates/home.html:7 msgid "Block Trackers" -msgstr "" +msgstr "Bloca els elements de seguiment" #: templates/home.html:11 msgid "BLOCK TRACKERS" -msgstr "" +msgstr "BLOCA ELS ELEMENTS DE SEGUIMENT" #: templates/home.html:12 msgid "" diff --git a/contents+zh-CN.po b/contents+zh-CN.po index e887334f8..1d7d83864 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -511,8 +511,9 @@ msgid "" " 2010. It not only protected people's identity online but also allowed them " "to access critical resources, social media, and websites which were blocked." msgstr "" -"随着 Tor 浏览器让日常互联网用户和社运认识更容易使用 Tor，Tor 在[阿拉伯之春](https://www.theguardian.com" -"/us-news/the-nsa-files)开始时成为了一种有效工具。它不仅保护了人们的在线身份，还允许他们访问被阻止的关键资源，社交媒体和网站。" +"随着 Tor 浏览器让日常互联网用户和社运人士更容易地使用 Tor，Tor " +"在2010年末开始的[阿拉伯之春](https://www.theguardian.com/us-news/the-nsa-" +"files)开始时成为了一种有效工具。它不仅保护了人们的在线身份，还允许他们访问被阻止的关键资源，社交媒体和网站。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -531,7 +532,7 @@ msgid "" "the documents also upheld assurances that, at that time, [Tor could not be " "cracked](https://www.wired.com/story/the-grand-tor/)." msgstr "" -"Tor 不仅对斯诺登的举报很有帮助，而且文件的内容证明了，至少在当时，[Tor 无法被破解](https://www.wired.com/story" +"Tor 不仅对斯诺登的解密很有帮助，而且文件的内容证明了，至少在当时，[Tor 无法被破解](https://www.wired.com/story" "/the-grand-tor/)。" #: https//www.torproject.org/about/history/ @@ -748,7 +749,7 @@ msgstr "告诉我们如何改进我们的网站。" #: templates/contact.html:17 msgid "Discuss UX related ideas." -msgstr "交流与UX相关的想法。" +msgstr "交流与用户体验相关的想法。" #: templates/contact.html:23 msgid "Find us on Social Media"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 5e0c66fbdaaba20b221a34d765bec4220cf2969b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:53:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ca.po b/contents+ca.po index bcd53fa59..868ad4c93 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -7322,7 +7322,7 @@ msgstr "Cerca" #: templates/layout.html:5 msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." -msgstr "" +msgstr "Defenseu-vos contra el seguiment i la vigilància. Eludiu la censura." #: templates/layout.html:9 msgid "Tor Project | Support"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 8b84e3e418ae9323d227f0f2f8ea193217fccf96 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:52:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 79e949fba..d8ecdba6c 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -854,7 +854,7 @@ msgstr "Vés a l'F-Droid" #: templates/download-android.html:36 msgid "Are you an iOS user? We encourage you to try Onion Browser." -msgstr "" +msgstr "Sou usuari d'iOS? Vos recomanem que proveu l'Onion Browser." #: templates/download-languages.html:11 templates/download-options.html:11 msgid "Language" @@ -862,59 +862,68 @@ msgstr "Llengua" #: templates/download-tor.html:25 templates/download-tor.html:30 msgid "sig" -msgstr "" +msgstr "sig" #: templates/download.html:5 msgid "Get Connected" -msgstr "" +msgstr "Connecteu-vos-hi" #: templates/download.html:7 msgid "Get connected" -msgstr "" +msgstr "Connecteu-vos-hi" #: templates/download.html:9 msgid "" "If you are in a country where Tor is blocked, you can configure Tor to " "connect to a bridge during the setup process." msgstr "" +"Si esteu en un país on el Tor es troba blocat, podeu configurar-lo perquè es" +" connecti a un pont durant el procés de configuració." #: templates/download.html:10 msgid "Select \"Tor is censored in my country.\"" -msgstr "" +msgstr "Seleccioneu «Tor està censurat al meu país»." #: templates/download.html:13 msgid "" "If Tor is not censored, one of the most common reasons Tor won't connect is " "an incorrect system clock. Please make sure it's set correctly." msgstr "" +"Si el Tor no està censurat, una de les raons més comunes perquè no es " +"connecti és un rellotge del sistema incorrecte. Comproveu que està ben " +"configurat." #: templates/download.html:14 msgid "Support Portal" -msgstr "" +msgstr "Portal d'assistència" #: templates/download.html:14 msgid "Read other FAQs at our Support Portal" -msgstr "" +msgstr "Llegiu altres PMF en el Portal d'Assistència" #: templates/download.html:19 templates/download.html:21 msgid "Stay safe" -msgstr "" +msgstr "Manteniu-vos segur" #: templates/download.html:23 msgid "Please do not torrent over Tor." -msgstr "" +msgstr "No utilitzeu la xarxa torrent a través del Tor." #: templates/download.html:24 msgid "" "Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime," " and others: they can be manipulated into revealing your IP address." msgstr "" +"El Navegador Tor blocarà connectors com ara Flash, RealPlayer, Quicktime i " +"altres: els podrien manipular perquè revelin la vostra adreça IP." #: templates/download.html:27 msgid "" "We do not recommend installing additional add-ons or plugins into Tor " "Browser" msgstr "" +"No recomanem que instal·leu cap connector o extensió addicional en el " +"Navegador Tor." #: templates/download.html:28 msgid "" @@ -922,38 +931,44 @@ msgid "" "already comes with HTTPS Everywhere, NoScript, and other patches to protect " "your privacy and security." msgstr "" +"Els connectors o extensions podrien eludir el Tor o comprometre la vostra " +"privadesa. El Navegador Tor ja s'ofereix amb HTTPS Everywhere, NoScript i " +"altres complements per a protegir la vostra privadesa i seguretat." #: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." -msgstr "" +msgstr "Llegiu el %s per a més consells sobre solució de problemes." #: templates/download.html:49 msgid "Verify Tor Browser signature" -msgstr "" +msgstr "Verifica la signatura del Navegador Tor" #: templates/download.html:54 msgid "Stand up for privacy and freedom online." -msgstr "" +msgstr "Lluiteu per la privadesa i la llibertat en la xarxa." #: templates/download.html:55 msgid "" "We're a nonprofit organization and rely on supporters like you to help us " "keep Tor robust and secure for millions of people worldwide." msgstr "" +"Som una organització sense afany de lucre i depenem dels col·laboradors com " +"vós perquè ens ajudin a mantenir el Tor robust i segur per a milions de " +"persones d'arreu del món." #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "DEFENSEU-VOS" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "FEU CRÉIXER LA XARXA" #: templates/hero-download.html:2 msgid "Defend yourself." -msgstr "" +msgstr "Defenseu-vos." #: templates/hero-download.html:45 msgid "Download in another language or platform" @@ -961,24 +976,24 @@ msgstr "Baixeu-lo en una altra llengua o plataforma" #: templates/hero-download.html:46 msgid "Download the latest alpha build" -msgstr "" +msgstr "Baixa l'últim paquet alfa" #: templates/hero-download.html:50 msgid "Read the latest release announcements" -msgstr "" +msgstr "Llegiu les notes de l'última versió" #: templates/hero-home.html:2 msgid "Browse Privately." -msgstr "" +msgstr "Navegueu de manera privada." #: templates/hero-home.html:5 msgid "Explore Freely." -msgstr "" +msgstr "Exploreu amb llibertat." #: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." -msgstr "" +msgstr "Defenseu-vos contra el seguiment i la vigilància. Eludiu la censura." #: templates/home.html:7 msgid "Block Trackers"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 142e1146917e97200a008ab1d4331dbde1e1dafa Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:48:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 1e071224b..2aba14bf8 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-05 16:50+0200\n" -"PO-Revision-Date: 2019-10-06 02:05+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-10-07 14:45+0000\n" +"Last-Translator: Chacal E.\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 610a9e92252086d62edeea2c03d6bf7f27d03634 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 14:47:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2646a1bf2..98b2b5b26 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-05 16:50+0200\n" -"PO-Revision-Date: 2019-10-06 02:05+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-10-07 14:45+0000\n" +"Last-Translator: Chacal E.\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +104,7 @@ msgstr "O volume persistente está desabilitado para usar Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "" +msgstr "Quando você reinicia o Tails, todos os dados da Electrum são perdidos, incluindo sua carteira Bitcoin.\nÉ altamente recomendável executar o Electrum apenas quando o recurso de persistência estiver ativado." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?"

1 0

[tor/master] hs: ADD_ONION NEW:BEST now defaults to ED25519-V3
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 52b7ae71b31671c758a2798e8c98abb720ac22f5 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 11 08:46:31 2019 -0400 hs: ADD_ONION NEW:BEST now defaults to ED25519-V3 From RSA1024 (v2) to v3 now. Closes #29669 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket29669 | 3 +++ src/feature/control/control_cmd.c | 7 ++++--- src/test/test_controller.c | 28 +++++++++++++++------------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/changes/ticket29669 b/changes/ticket29669 new file mode 100644 index 000000000..f7e98a16c --- /dev/null +++ b/changes/ticket29669 @@ -0,0 +1,3 @@ + o Minor feature (hidden service, control port): + - The ADD_ONION key blob keyword "BEST" now defaults from RSA1024 (v2) to + ED25519-V3 (v3). Closes ticket 29669. diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index f804ceafb..de1bef7e5 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -1982,8 +1982,7 @@ add_onion_helper_keyarg(const char *arg, int discard_pk, *hs_version = HS_VERSION_THREE; } else if (!strcasecmp(key_type_new, key_type)) { /* "NEW:<Algorithm>" - Generating a new key, blob as algorithm. */ - if (!strcasecmp(key_type_rsa1024, key_blob) || - !strcasecmp(key_type_best, key_blob)) { + if (!strcasecmp(key_type_rsa1024, key_blob)) { /* "RSA1024", RSA 1024 bit, also currently "BEST" by default. */ pk = crypto_pk_new(); if (crypto_pk_generate_key(pk)) { @@ -2002,7 +2001,9 @@ add_onion_helper_keyarg(const char *arg, int discard_pk, } decoded_key->v2 = pk; *hs_version = HS_VERSION_TWO; - } else if (!strcasecmp(key_type_ed25519_v3, key_blob)) { + } else if (!strcasecmp(key_type_ed25519_v3, key_blob) || + !strcasecmp(key_type_best, key_blob)) { + /* "ED25519-V3", ed25519 key, also currently "BEST" by default. */ ed25519_secret_key_t *sk = tor_malloc_zero(sizeof(*sk)); if (ed25519_secret_key_generate(sk, 1) < 0) { tor_free(sk); diff --git a/src/test/test_controller.c b/src/test/test_controller.c index b9cbe0a14..55eb79e44 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -243,8 +243,22 @@ test_add_onion_helper_keyarg_v3(void *arg) tor_free(pk.v3); pk.v3 = NULL; tor_free(key_new_blob); + /* Test "BEST" key generation (Assumes BEST = ED25519-V3). */ + tor_free(pk.v3); pk.v3 = NULL; + tor_free(key_new_blob); + ret = add_onion_helper_keyarg("NEW:BEST", 0, &key_new_alg, &key_new_blob, + &pk, &hs_version, NULL); + tt_int_op(ret, OP_EQ, 0); + tt_int_op(hs_version, OP_EQ, HS_VERSION_THREE); + tt_assert(pk.v3); + tt_str_op(key_new_alg, OP_EQ, "ED25519-V3"); + tt_assert(key_new_blob); + tt_ptr_op(reply_str, OP_EQ, NULL); + /* Test discarding the private key. */ tor_free(reply_str); + tor_free(pk.v3); pk.v3 = NULL; + tor_free(key_new_blob); ret = add_onion_helper_keyarg("NEW:ED25519-V3", 1, &key_new_alg, &key_new_blob, &pk, &hs_version, NULL); @@ -323,22 +337,10 @@ test_add_onion_helper_keyarg_v2(void *arg) tt_assert(key_new_blob); tt_ptr_op(reply_str, OP_EQ, NULL); - /* Test "BEST" key generation (Assumes BEST = RSA1024). */ - crypto_pk_free(pk.v2); pk.v2 = NULL; - tor_free(key_new_blob); - ret = add_onion_helper_keyarg("NEW:BEST", 0, &key_new_alg, &key_new_blob, - &pk, &hs_version, NULL); - tt_int_op(ret, OP_EQ, 0); - tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO); - tt_assert(pk.v2); - tt_str_op(key_new_alg, OP_EQ, "RSA1024"); - tt_assert(key_new_blob); - tt_ptr_op(reply_str, OP_EQ, NULL); - /* Test discarding the private key. */ crypto_pk_free(pk.v2); pk.v2 = NULL; tor_free(key_new_blob); - ret = add_onion_helper_keyarg("NEW:BEST", 1, &key_new_alg, &key_new_blob, + ret = add_onion_helper_keyarg("NEW:RSA1024", 1, &key_new_alg, &key_new_blob, &pk, &hs_version, NULL); tt_int_op(ret, OP_EQ, 0); tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1317'
by nickm＠torproject.org 07 Oct '19

07 Oct '19

commit 7a26f14a37dc5ba6b6ef2816a22b6893502726a3 Merge: 56e8d84ea 52b7ae71b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 7 10:23:44 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1317' changes/ticket29669 | 3 +++ src/feature/control/control_cmd.c | 7 ++++--- src/test/test_controller.c | 28 +++++++++++++++------------- 3 files changed, 22 insertions(+), 16 deletions(-)

1 0