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

[tor-browser-spec/master] Bug 32147: Update release instructions with Torbutton changes for 9.0
by gk＠torproject.org 21 Oct '19

21 Oct '19

commit f8ce4dbe63724b0af30ec2132174f19908d843f3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 21 12:47:15 2019 +0000 Bug 32147: Update release instructions with Torbutton changes for 9.0 --- processes/ReleaseProcess | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 2b772e5..f6256db 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -4,6 +4,10 @@ # #. Tag any relevant component versions. +# In particular: before tagging the tor-browser tag, the final code from +# Torbutton needs to get included and in order to avoid unnecessary commit +# inflation the commit for bumping the git submodule should be a fixup commit +# to the one with "Pick up latest Torbutton code" in its commit message. #. Update changelog and relevant config files in tor-browser-build. cd tor-browser-build @@ -45,6 +49,8 @@ # For stable releases put tails-dev(a)boum.org into Cc. #. Codesign the macOS dmg files. + # XXX: Update with Notarization bits once they are included in our signing + # setup torsocks ssh mac-signer "mkdir $TORBROWSER_VERSION" torsocks rsync -avP $TORBROWSER_BUILDDIR/*.dmg mac-signer:$TORBROWSER_VERSION/ torsocks ssh mac-signer

1 0

[tor-browser-spec/master] Merge branch 'bug_32147'
by gk＠torproject.org 21 Oct '19

21 Oct '19

commit b11c935c4ef26a0a1317a2213b42e38186ba4970 Merge: d25eeb6 f8ce4db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 21 12:49:17 2019 +0000 Merge branch 'bug_32147' processes/ReleaseProcess | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[translation/torbutton-abouttbupdatedtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit 1dc0e9422fe829464e290338bd317841d8a26638 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 08:21:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- tr/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd index 507b19880..d8e3612f0 100644 --- a/tr/abouttbupdate.dtd +++ b/tr/abouttbupdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Değişiklik Günlüğü"> <!ENTITY aboutTBUpdate.updated "Tor Browser güncellendi."> -<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler"> +<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler "> <!ENTITY aboutTBUpdate.linkLabel "web sitemizden edinilebilir"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Sürüm">

1 0

[translation/torbutton-abouttbupdatedtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit 343d189199deecaf99c687c0f43ccdff7829b360 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 08:21:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- tr/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd index 507b19880..d8e3612f0 100644 --- a/tr/abouttbupdate.dtd +++ b/tr/abouttbupdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Değişiklik Günlüğü"> <!ENTITY aboutTBUpdate.updated "Tor Browser güncellendi."> -<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler"> +<!ENTITY aboutTBUpdate.linkPrefix "Bu sürüm hakkındaki güncel bilgiler "> <!ENTITY aboutTBUpdate.linkLabel "web sitemizden edinilebilir"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Sürüm">

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit bfa2cf21a4b00ca8d6c418ce309750179267ef63 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 08:20:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 51398d813..eeae10c2c 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5,6 +5,7 @@ # Emma Peel, 2019 # erinm, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 +# Volkan Gezer <volkangezer(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-05 17:40+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,7 +245,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "İNDİRİLİYOR" +msgstr "İNDİRMEK" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description)

1 0

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

21 Oct '19

commit e473282c90ee709a746e969bded238fbc93a880b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 08:20:01 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 51398d813..eeae10c2c 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5,6 +5,7 @@ # Emma Peel, 2019 # erinm, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 +# Volkan Gezer <volkangezer(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-05 17:40+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,7 +245,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "İNDİRİLİYOR" +msgstr "İNDİRMEK" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description)

1 0

[tpo/staging] remove unpushed lego commit from submodule
by emmapeel＠torproject.org 21 Oct '19

21 Oct '19

commit a428daf22bb523e60fa3632e17b3f7309f4f4405 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Oct 21 10:04:47 2019 +0200 remove unpushed lego commit from submodule --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index f69eb16..a2e8d34 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f69eb16bf837b326cdec06e1af22a26770cdac38 +Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8

1 0

[torspec/master] control: Add GETINFO dir/status-vote/current/consensus-microdesc
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit b7cfa8619947be4a377366365f5ddee8e0733330 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 15:00:21 2019 +1000 control: Add GETINFO dir/status-vote/current/consensus-microdesc Ticket 31684 adds support for GETINFO dir/status-vote/current/consensus-microdesc as of Tor 0.4.3.1-alpha. Closes 31762. --- control-spec.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/control-spec.txt b/control-spec.txt index 7fde9e0..7f659ae 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -811,6 +811,7 @@ if unknown "dir/status-vote/current/consensus" [added in Tor 0.2.1.6-alpha] + "dir/status-vote/current/consensus-microdesc" [added in Tor 0.4.3.1-alpha] "dir/status/authority" "dir/status/fp/<F>" "dir/status/fp/<F1>+<F2>+<F3>"

1 0

[tor/master] control/getinfo: Use standard error handling
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 92fa5239fc357c2078bf613a875c986a3bd97710 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 13:49:44 2019 +1000 control/getinfo: Use standard error handling Use BUG() for coding errors, and `< 0` for error checks. Fix to 31684. --- src/feature/control/control_getinfo.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index b77869e21..979fa4480 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -333,9 +333,8 @@ getinfo_helper_current_consensus(consensus_flavor_t flavor, const char** errmsg) { const char *flavor_name = networkstatus_get_flavor_name(flavor); - if (!strcmp(flavor_name, "??")) { - *errmsg = "Could not open cached consensus. " - "Make sure FetchUselessDescriptors is set to 1."; + if (BUG(!strcmp(flavor_name, "??"))) { + *errmsg = "Internal error: unrecognized flavor name."; return -1; } if (we_want_to_fetch_flavor(get_options(), flavor)) { @@ -615,14 +614,14 @@ getinfo_helper_dir(control_connection_t *control_conn, } else if (!strcmp(question, "dir/status-vote/current/consensus")) { int consensus_result = getinfo_helper_current_consensus(FLAV_NS, answer, errmsg); - if (consensus_result == -1) { + if (consensus_result < 0) { return -1; } } else if (!strcmp(question, "dir/status-vote/current/consensus-microdesc")) { int consensus_result = getinfo_helper_current_consensus(FLAV_MICRODESC, answer, errmsg); - if (consensus_result == -1) { + if (consensus_result < 0) { return -1; } } else if (!strcmp(question, "network-status")) { /* v1 */

1 0

[tor/master] test/getinfo: Remove unnecessary test code
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 4fde7699ee5975db55c418bc7011eaabc64d94c9 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 14:18:54 2019 +1000 test/getinfo: Remove unnecessary test code Fix for 31684. --- src/test/test_controller.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index d11b26e8d..f5c927f62 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -1752,7 +1752,6 @@ test_getinfo_helper_current_consensus_from_file(void *arg) (void)arg; - setup_bridge_mocks(); MOCK(tor_mmap_file, mock_tor_mmap_file); MOCK(tor_munmap_file, mock_tor_munmap_file); @@ -1774,7 +1773,6 @@ test_getinfo_helper_current_consensus_from_file(void *arg) errmsg = NULL; done: - clear_bridge_mocks(); tor_free(answer); UNMOCK(tor_mmap_file); UNMOCK(tor_munmap_file); @@ -1791,9 +1789,7 @@ test_getinfo_helper_current_consensus_from_cache(void *arg) const char *errmsg = NULL; (void)arg; - setup_bridge_mocks(); or_options_t *options = get_options_mutable(); - int previous_fetch_value = options->FetchUselessDescriptors; options->FetchUselessDescriptors = 1; MOCK(dirserv_get_consensus, mock_dirserv_get_consensus); @@ -1817,10 +1813,9 @@ test_getinfo_helper_current_consensus_from_cache(void *arg) tor_free(mock_microdesc_consensus_cache->dir); tor_free(answer); errmsg = NULL; - options->FetchUselessDescriptors = previous_fetch_value; done: - clear_bridge_mocks(); + options->FetchUselessDescriptors = 0; tor_free(answer); tor_free(mock_microdesc_consensus_cache); UNMOCK(dirserv_get_consensus);

1 0