- tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/709'
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit d11976b8bd4bded2939ff973d7b2beb36c201bf0 Merge: 2790ee368 6c652eae0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 26 15:34:54 2019 +0200 Merge branch 'tor-github/pr/709' changes/bug29018 | 5 + doc/tor.1.txt | 5 +- src/feature/nodelist/torcert.c | 4 +- src/feature/nodelist/torcert.h | 2 +- src/feature/relay/router.c | 375 ++++++++++--- src/feature/relay/router.h | 23 +- src/feature/relay/routerkeys.c | 16 +- src/feature/relay/routerkeys.h | 4 +- src/test/test_dir.c | 1203 +++++++++++++++++++++++++++++++--------- src/test/test_router.c | 3 + 10 files changed, 1276 insertions(+), 364 deletions(-)

1 0

[tor/master] fixup! test_dir: Refactor common code out of the dir_format unit tests
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 6c652eae0a95cae095f5adad9cc51e1f1a183245 Author: teor <teor(a)torproject.org> Date: Wed Feb 20 00:40:18 2019 +1000 fixup! test_dir: Refactor common code out of the dir_format unit tests --- src/test/test_dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 210b09a4e..31471fb7d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -355,8 +355,9 @@ get_new_rsa_key_block(const char *key_name, crypto_pk_t *pk1) "%s\n%s", key_name, pk1_str); - tor_assert(block); + tor_free(pk1_str); + tor_assert(block); return block; }

1 0

[tor/master] routerkeys: Log failures at info-level in make_tap_onion_key_crosscert()
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 0c0f21582285bec0fe68f71e293158eeedaeeaa3 Author: teor <teor(a)torproject.org> Date: Tue Feb 19 18:52:54 2019 +1000 routerkeys: Log failures at info-level in make_tap_onion_key_crosscert() --- src/feature/relay/routerkeys.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index bdd7a82b5..d965777ad 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -706,6 +706,8 @@ make_tap_onion_key_crosscert(const crypto_pk_t *onion_key, *len_out = 0; if (crypto_pk_get_digest(rsa_id_key, (char*)signed_data) < 0) { + log_info(LD_OR, "crypto_pk_get_digest failed in " + "make_tap_onion_key_crosscert!"); return NULL; } memcpy(signed_data + DIGEST_LEN, master_id_key->pubkey, ED25519_PUBKEY_LEN); @@ -713,8 +715,12 @@ make_tap_onion_key_crosscert(const crypto_pk_t *onion_key, int r = crypto_pk_private_sign(onion_key, (char*)signature, sizeof(signature), (const char*)signed_data, sizeof(signed_data)); - if (r < 0) + if (r < 0) { + /* It's probably missing the private key */ + log_info(LD_OR, "crypto_pk_private_sign failed in " + "make_tap_onion_key_crosscert!"); return NULL; + } *len_out = r;

1 0

[tor/master] router: Add some missing #endif comments
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 51f59f213e3850d1d77f0e60355d914c6583aeb4 Author: teor <teor(a)torproject.org> Date: Tue Feb 19 21:23:27 2019 +1000 router: Add some missing #endif comments --- src/feature/relay/router.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index f17e6a943..55b9ef9e6 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -134,8 +134,8 @@ STATIC extrainfo_t *router_build_fresh_signed_extrainfo( STATIC void router_update_routerinfo_from_extrainfo(routerinfo_t *ri, const extrainfo_t *ei); STATIC int router_dump_and_sign_routerinfo_descriptor_body(routerinfo_t *ri); -#endif +#endif /* defined(TOR_UNIT_TESTS) */ -#endif +#endif /* defined(ROUTER_PRIVATE) */ #endif /* !defined(TOR_ROUTER_H) */

1 0

[tpo/master] Update Tor Browser versions
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit f65272ceac40dd903fe82a912f9373863838e89e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 11:07:24 2019 +0100 Update Tor Browser versions --- .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++-------- databags/versions.ini | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 14834b2..0ab95b1 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,12 +5,12 @@ _template: empty.html body: [ -"8.0.6", -"8.0.6-MacOS", -"8.0.6-Linux", -"8.0.6-Windows", -"8.5a8", -"8.5a8-MacOS", -"8.5a8-Linux", -"8.5a8-Windows" +"8.0.8", +"8.0.8-MacOS", +"8.0.8-Linux", +"8.0.8-Windows", +"8.5a10", +"8.5a10-MacOS", +"8.5a10-Linux", +"8.5a10-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index ac3c02f..cbb9a5c 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,11 +1,11 @@ [torbrowser-stable] -version = 8.0.6 -release_date = 2019-02-12 -win32 = 0.3.5.7 +version = 8.0.8 +release_date = 2019-03-23 +win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a8 -release_date = 2019-02-15 +version = 8.5a10 +release_date = 2019-03-25 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/master] add Korean language
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 03db16445d1c552a56093923e819086101213b92 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 11:27:44 2019 +0100 add Korean language --- databags/about+ko.ini | 1 + databags/alternatives.ini | 6 ++++++ databags/menu+ko.ini | 19 +++++++++++++++++++ databags/menu_footer+ko.ini | 1 + tpo.lektorproject | 5 +++++ 5 files changed, 32 insertions(+) diff --git a/databags/about+ko.ini b/databags/about+ko.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+ko.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 149d345..37f788c 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -28,6 +28,12 @@ order = order-last url = /fr/ language = Français (fr) +[ko] +direction = text-left +order = order-last +url = /ko/ +language = 한국어 (ko) + [id] direction = text-left order = order-last diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini new file mode 100644 index 0000000..fd03492 --- /dev/null +++ b/databags/menu+ko.ini @@ -0,0 +1,19 @@ +[about] +path = /about/history +label = About + +[documentation] +path = https://www.torproject.org/docs/documentation.html.en +label = Documentation + +[support] +path = https://support.torproject.org/ +label = Support + +[blog] +path = https://blog.torproject.org +label = Blog + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+ko.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/tpo.lektorproject b/tpo.lektorproject index 40405cd..0b4bc3b 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -40,6 +40,11 @@ name = Italiano (it) url_prefix = /it/ locale = it +[alternatives.ko] +name = 한국어 (ko) +url_prefix = /ko/ +locale = ko + [alternatives.pt-BR] name = Português Brasil (pt-BR) url_prefix = /pt-BR/

1 0

[tpo/master] typo
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit a5419f125178b358b2c183abf31e38d7ed594e00 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:56:12 2019 +0100 typo --- databags/download-alternatives-alpha.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 2fdf984..c79e32a 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -78,9 +78,9 @@ language = Português Brasil(pt-BR) language = Русский (ru) url = /ru/ -[sv] -url = /sv/ -language = Svenska (sv) +[sv-SE] +url = /sv-SE/ +language = Svenska (sv-SE) [tr] url = /tr/

1 0

[tpo/master] remove incomplete languages
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 7efabb345184332a04f166e3617a559fd6bab5e8 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:54:41 2019 +0100 remove incomplete languages --- configs/i18n.ini | 2 +- databags/alternatives.ini | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 533d593..04dbd31 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = bn-BD,de,es,fr,id,it,pt-BR,ru,tr,zh-CN +translations = de,es,fr,it,pt-BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = 'https://lektor-staging.torproject.org/tpo/staging/' diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 37f788c..035c0c9 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,12 +4,6 @@ order = order-last url = / language = English (en) -[bn-BD] -direction = text-left -order = order-last -url = /bn-BD/ -language = বাংলা ভাষা (bn-BD) - [de] direction = text-left order = order-last @@ -28,18 +22,6 @@ order = order-last url = /fr/ language = Français (fr) -[ko] -direction = text-left -order = order-last -url = /ko/ -language = 한국어 (ko) - -[id] -direction = text-left -order = order-last -url = /id/ -language = Indonesia (id) - [it] direction = text-left order = order-last @@ -57,15 +39,3 @@ direction = text-left order = order-last url = /ru/ language = Русский (ru) - -[tr] -direction = text-left -order = order-last -url = /tr/ -language = Türkçe (tr) - -[zh-CN] -direction = text-left -order = order-last -url = /zh-CN/ -language = 简体字 (zh-CN)

1 0

[tpo/master] add more locales to alphas
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit d163d1231fb94d518ac8ee7ae721e4678ab79b67 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:55:53 2019 +0100 add more locales to alphas --- databags/download-alternatives-alpha.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index c79e32a..d13d584 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -10,6 +10,10 @@ language = عربية (ar) url = /ca/ language = Catalá (ca) +[cs] +url = /cs/ +language = Čeština (cs) + [da] url = /da/ language = Dansk (da) @@ -18,6 +22,10 @@ language = Dansk (da) url = /de/ language = Deutsch (de) +[el] +url = /el/ +language = ελληνικά (el) + [es-ES] url = /es/ language = Español (es) @@ -38,6 +46,10 @@ language = Gaeilge (ga) url = /he/ language = עברית (he) +[hu] +url = /hu/ +language = Magyar (hu) + [id] url = /id/ language = Indonesia (id) @@ -54,6 +66,10 @@ language = Italiano (it) url = /ja/ language = 日本語 (ja) +[ka] +url = /ka/ +language = ქართული ენა (ka) + [ko] url = /ko/ language = 한국어 (ko)

1 0

[tpo/master] Merge branch 'staging'
by hiro＠torproject.org 26 Mar '19

26 Mar '19

1 0