- tor-commits - lists.torproject.org

[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

[tpo/master] Updates to databags
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit a4d5bfa779e0e262bcccbbbd7d064a8b7b1d41c0 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 14:31:45 2019 +0100 Updates to databags --- databags/menu+bn-BD.ini | 2 +- databags/menu+de.ini | 2 +- databags/menu+en.ini | 2 +- databags/menu+es.ini | 2 +- databags/menu+fr.ini | 2 +- databags/menu+id.ini | 2 +- databags/menu+it.ini | 2 +- databags/menu+ko.ini | 2 +- databags/menu+pt-BR.ini | 2 +- databags/menu+ru.ini | 2 +- databags/menu+tr.ini | 2 +- databags/menu+zh-CN.ini | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini index 0ad1564..9f5fff0 100644 --- a/databags/menu+bn-BD.ini +++ b/databags/menu+bn-BD.ini @@ -3,7 +3,7 @@ path = /about/history label = ইতিহাস [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = ডকুমেন্টেশন [support] diff --git a/databags/menu+de.ini b/databags/menu+de.ini index 2edf503..463b5b2 100644 --- a/databags/menu+de.ini +++ b/databags/menu+de.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+en.ini b/databags/menu+en.ini index fd03492..d77e346 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 2ed6b2e..57b0146 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 0f45097..d078638 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+id.ini b/databags/menu+id.ini index 007f036..5c7d032 100644 --- a/databags/menu+id.ini +++ b/databags/menu+id.ini @@ -3,7 +3,7 @@ path = /about/history label = Tentang [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Dokumentasi [support] diff --git a/databags/menu+it.ini b/databags/menu+it.ini index 00a0575..9dcc41b 100644 --- a/databags/menu+it.ini +++ b/databags/menu+it.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini index fd03492..d77e346 100644 --- a/databags/menu+ko.ini +++ b/databags/menu+ko.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 2df06d7..89cf72f 100644 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini index fd03492..d77e346 100644 --- a/databags/menu+ru.ini +++ b/databags/menu+ru.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini index 26f3b8d..d14053f 100644 --- a/databags/menu+tr.ini +++ b/databags/menu+tr.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini index 1a622ff..a720d13 100644 --- a/databags/menu+zh-CN.ini +++ b/databags/menu+zh-CN.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support]

1 0

[tor/maint-0.4.0] Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit b76ae3898d5d6e34c291f8e0506147a5bd4cbc07 Merge: 8bc3ac6a8 091f8688b Author: teor <teor(a)torproject.org> Date: Tue Mar 26 11:48:52 2019 +1000 Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 ++++++- src/test/test_dir.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --cc src/test/test_dir.c index 4132d42d1,0e44c47f3..b9a48c650 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -2029,8 -1998,45 +2048,46 @@@ test_dir_dirserv_read_measured_bandwidt smartlist_free(bw_file_headers); tor_free(bw_file_headers_str); + /* Test v1.x.x bandwidth line with vote=0. + * It will be ignored it and logged it at debug level. */ + const char *relay_lines_ignore = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0" + "unmeasured=0\n"; + + /* Create the bandwidth file */ + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + + /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or + * "unmeasured=0". + * They will not be ignored. */ + /* Create the bandwidth file */ + const char *relay_lines_vote = + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n" + "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n"; + tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote); + write_str_to_file(fname, content, 0); + tor_free(content); + + /* Read the bandwidth file */ + setup_full_capture_of_logs(LOG_DEBUG); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); + expect_log_msg_not_containing("Ignoring bandwidth file line"); + teardown_capture_of_logs(); + done: + unlink(fname); tor_free(fname); tor_free(header_lines_v100); tor_free(header_lines_v110_no_terminator);

1 0

[tor/maint-0.4.0] test/dir: add an extra argument to dirserv_read_measured_bandwidths()
by asn＠torproject.org 26 Mar '19

26 Mar '19

commit 091f8688b8ee15b57ed5bc24bac12a7a0b7f5725 Author: teor <teor(a)torproject.org> Date: Thu Mar 21 12:56:28 2019 +1000 test/dir: add an extra argument to dirserv_read_measured_bandwidths() Part of 29806. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cbb414ed6..0e44c47f3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2014,7 +2014,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_containing("Ignoring bandwidth file line"); teardown_capture_of_logs(); @@ -2032,7 +2032,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_not_containing("Ignoring bandwidth file line"); teardown_capture_of_logs();

1 0