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

[tpo/master] Fore rebuild of website
by boklm＠torproject.org 09 Jan '20

09 Jan '20

commit b8f0cd15c8934f195f7e5d9082f2e7a28e021d6d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 9 17:37:17 2020 +0100 Fore rebuild of website

1 0

[lego/master] Update footer.html
by antonela＠torproject.org 09 Jan '20

09 Jan '20

commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 Author: Antonela <hola(a)antonela.me> Date: Thu Jan 9 11:58:52 2020 -0300 Update footer.html Fix weird spacing and remove white border --- templates/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index af856f0..7a84b12 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -61,8 +61,8 @@ </div> </div> </div> - <div class="col-12 d-flex justify-content-center border"> - <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5"> + <div class="col-12 d-flex justify-content-center"> + <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">{{ _('Sign up') }}</a></p>

1 0

[tpo/master] another one for #32432, as previous
by emmapeel＠torproject.org 09 Jan '20

09 Jan '20

commit b89ec696b970ce68d5cf63a52f96e7a5cb450cf3 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Jan 9 15:56:38 2020 +0100 another one for #32432, as previous --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 5c49bd7..81a71ca 100644 --- a/.htaccess +++ b/.htaccess @@ -88,7 +88,7 @@ RewriteRule ^download/easy-download(.*) /download [R=302,L] RewriteRule ^download/download-easy(.*) /download [R=302,L] # Relays -RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=302,L] +RewriteRule ^relays(.*) https://community.torproject.org/relay/ [R=302,L] # Index Pages RewriteRule ^about/overview.html(.*) /about/history [R=302,L]

1 0

[tpo/master] Update circle-pattern.png
by antonela＠torproject.org 09 Jan '20

09 Jan '20

commit 4f9851e58de00b882dda8cf031fb3ece9d7643dc Author: Antonela <hola(a)antonela.me> Date: Thu Jan 9 11:54:01 2020 -0300 Update circle-pattern.png close https://trac.torproject.org/projects/tor/ticket/32359 --- assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/circle-pattern.png b/assets/static/images/circle-pattern.png index 565c7b9..d1d6033 100644 Binary files a/assets/static/images/circle-pattern.png and b/assets/static/images/circle-pattern.png differ

1 0

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

09 Jan '20

commit e5878e6822d64b67ba97f548fd43e0bbecb1e826 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 9 14:53:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index f6474c8cfb..aa3d9cb3a2 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -6937,6 +6937,8 @@ msgid "" "](#operating-system-os), with its mobile version (fennec) available for " "Android." msgstr "" +"Firefox доступен для [операционных систем](#operating-system-os) Windows, " +"macOS и Linux. Есть мобильная версия для Android." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[tpo/master] update link. will-fix: https://trac.torproject.org/projects/tor/ticket/32432
by emmapeel＠torproject.org 09 Jan '20

09 Jan '20

commit db9a082f69affa78de82c49910840def3c95f242 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Jan 9 15:51:16 2020 +0100 update link. will-fix: https://trac.torproject.org/projects/tor/ticket/32432 --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 54ce2de..5c49bd7 100644 --- a/.htaccess +++ b/.htaccess @@ -49,7 +49,7 @@ RewriteRule ^projects/obfsproxy-instructions(.*) https://2019.www.torproject.org RewriteRule ^projects/obfsproxy(.*) https://2019.www.torproject.org/docs/pluggable-transports [R=302,L] #Relays -RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=302,L] +RewriteRule ^relay-guide(.*) https://community.torproject.org/relay/ [R=302,L] # GetInvolved RewriteRule ^getinvolved/$ https://2019.www.torproject.org/getinvolved/volunteer [R=302,L]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 09 Jan '20

09 Jan '20

commit e39640a3ed879f18415f2a2b0543afc718eaad19 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 9 14:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index ee339be850..263b14ca6f 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -36,7 +36,7 @@ msgstr "Tor 社区由各种不同的贡献者组成。" msgid "" "Some people write documentation and bug reports, while others hold Tor " "events and conduct outreach." -msgstr "" +msgstr "一些人编写文档与提交漏洞报告，另一些人举办Tor活动并进行宣传外展。" #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -60,22 +60,22 @@ msgstr "" msgid "" "Relays are the backbone of the Tor network. Help make Tor stronger and " "faster by running a relay today." -msgstr "" +msgstr "中继是Tor 网络的主心骨。您也可以搭建一条中继来让Tor 网络更强更快。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.cta) msgid "Grow the Tor network" -msgstr "" +msgstr "拓展Tor 网络" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "The Tor network relies on volunteers to donate bandwidth." -msgstr "" +msgstr "Tor 网络依赖于志愿者来捐助带宽。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "The more people who run relays, the better the Tor network will be." -msgstr "" +msgstr "越多人运行中继，Tor 网络就会越好。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) @@ -83,44 +83,44 @@ msgid "" "The current Tor network is quite small compared to the number of people who " "need to use Tor, which means we need more dedicated volunteers like you to " "run relays." -msgstr "" +msgstr "和目前正在使用Tor 网络的人数像比，Tor 网络还很小，这意味着我们需要更多像您一样的志愿者来搭建中继。" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "By running a Tor relay you can help make the Tor network:" -msgstr "" +msgstr "通过运行一条Tor 中继，您可以帮助Tor 网络：" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "* faster (and therefore more usable)" -msgstr "" +msgstr "* 更快（并且因此而更可用）" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "* more robust against attacks" -msgstr "" +msgstr "* 更强大的抵御攻击的能力" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "* more stable in case of outages" -msgstr "" +msgstr "* 中断时更稳定" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "* safer for its users (spying on more relays is harder than on a few)" -msgstr "" +msgstr "* 对于用户来说更安全（针对大量中继的监视的难度会显著提高）" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "" "Running a relay requires technical skill and commitment, which is why we've " "created a wealth of resources to help our relay operators." -msgstr "" +msgstr "运行中继需要技术技能和奉献精神，这就是我们创建大量资源来帮助我们的运行中继的志愿者的原因。" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.title) msgid "Training" -msgstr "" +msgstr "训练" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.subtitle) @@ -128,17 +128,17 @@ msgstr "" #: (content/training/resources/contents+en.lrpage.subtitle) msgid "" "Do you teach your community about using Tor? These resources are for you." -msgstr "" +msgstr "您是否有向您的社区传授使用Tor的方法？这些是提供给您的资源。" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.cta) msgid "Check our resources" -msgstr "" +msgstr "查看我们的资源" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) msgid "## We want to teach the world about Tor. Can you help?" -msgstr "" +msgstr "## 我们想教全世界使用Tor。您可以提供帮助吗？" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) @@ -177,12 +177,12 @@ msgstr "" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.cta) msgid "Grow your .onion" -msgstr "" +msgstr "创建您自己的 .onion" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.body) msgid "##What are Onion Services?" -msgstr "" +msgstr "##什么是洋葱服务？" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.body) @@ -195,7 +195,7 @@ msgstr "" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.title) msgid "Localization" -msgstr "" +msgstr "本地化" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.subtitle)

1 0

[tor/master] Turn authdir_mode_v3() into a non-inline function
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 09f03e6e3f6651281cf2bf7eb2968d9659a6658d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:20:31 2019 -0500 Turn authdir_mode_v3() into a non-inline function This change means that authmode.h no longer needs to see or_options_t, and frees us from an ordering dependency. --- src/feature/dirauth/authmode.c | 9 +++++++++ src/feature/dirauth/authmode.h | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/feature/dirauth/authmode.c b/src/feature/dirauth/authmode.c index 29fcc6d1a..2292d1a41 100644 --- a/src/feature/dirauth/authmode.c +++ b/src/feature/dirauth/authmode.c @@ -26,6 +26,15 @@ authdir_mode(const or_options_t *options) { return options->AuthoritativeDir != 0; } + +/* Return true iff we believe ourselves to be a v3 authoritative directory + * server. */ +int +authdir_mode_v3(const or_options_t *options) +{ + return authdir_mode(options) && options->V3AuthoritativeDir != 0; +} + /** Return true iff we are an authoritative directory server that is * authoritative about receiving and serving descriptors of type * <b>purpose</b> on its dirport. diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h index 11bc40d8d..c1134a4c2 100644 --- a/src/feature/dirauth/authmode.h +++ b/src/feature/dirauth/authmode.h @@ -14,19 +14,12 @@ #ifdef HAVE_MODULE_DIRAUTH int authdir_mode(const or_options_t *options); +int authdir_mode_v3(const or_options_t *options); int authdir_mode_handles_descs(const or_options_t *options, int purpose); int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); -/* Return true iff we believe ourselves to be a v3 authoritative directory - * server. */ -static inline int -authdir_mode_v3(const or_options_t *options) -{ - return authdir_mode(options) && options->V3AuthoritativeDir != 0; -} - /* Is the dirauth module enabled? */ #define have_module_dirauth() (1)

1 0

[tor/master] conscache.h: declare config_line_t structure.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit ca9d605fa7c72083b0ef721b4b555de80a5795d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:24:21 2019 -0500 conscache.h: declare config_line_t structure. This frees us from a dependency on include order. --- src/feature/dircache/conscache.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/feature/dircache/conscache.h b/src/feature/dircache/conscache.h index 5e0489f3e..38e3ba85a 100644 --- a/src/feature/dircache/conscache.h +++ b/src/feature/dircache/conscache.h @@ -14,6 +14,8 @@ typedef struct consensus_cache_entry_t consensus_cache_entry_t; typedef struct consensus_cache_t consensus_cache_t; +struct config_line_t; + HANDLE_DECL(consensus_cache_entry, consensus_cache_entry_t, ) #define consensus_cache_entry_handle_free(h) \ FREE_AND_NULL(consensus_cache_entry_handle_t, \

1 0

[tor/master] changes file for 32764.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 8b2041c343098052dcec03cd6eda7087bc5c7616 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 14:45:40 2019 -0500 changes file for 32764. --- changes/ticket32764 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/ticket32764 b/changes/ticket32764 new file mode 100644 index 000000000..7795339f3 --- /dev/null +++ b/changes/ticket32764 @@ -0,0 +1,9 @@ + o Code simplification and refactoring: + + - Add numerous missing dependencies to our include files, so that + they can be included in different reasonable orders and still + compile. Addresses part of ticket 32764. + + - Fix some small issues in our code that prevented automatic + formatting tools from working. + Addresses part of ticket 32764.

1 0