tor-commits November 2019

tor-commits@lists.torproject.org

20 participants
2923 discussions

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit 93893e6b1fbbeec6fd282aeda0628c52b7b1ced8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 16:49:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- nl/nl.po | 6 +++--- zh_TW/zh_TW.po | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 08adee1e4..0ad45e419 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -7,7 +7,7 @@ # bacovane <bart-ts(a)tushmail.com>, 2018 # cialenhh <c1914502(a)drdrb.com>, 2013 # gjlajfklajdkladj kasldfjaslkf <1bsuaz+3xy1gedeysrhc(a)sharklasers.com>, 2015 -# kwadronaut <kwadronaut(a)autistici.org>, 2017 +# kwadronaut <kwadronaut(a)autistici.org>, 2017,2019 # Meteor 0id, 2019 # Nathan Follens, 2016 # Meteor 0id, 2019 @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2019-11-11 11:23+0000\n" +"PO-Revision-Date: 2019-11-21 11:10+0000\n" "Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgstr "Aangepast" #: ../lib/Tails/Persistence/Configuration/Presets.pm:55 msgid "Personal Data" -msgstr "Persoonlijke gegevens" +msgstr "Persoonlijke documenten" #: ../lib/Tails/Persistence/Configuration/Presets.pm:57 msgid "Keep files stored in the `Persistent' directory" diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 6286c00b9..625b1dcd7 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -7,6 +7,7 @@ # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2019 +# Joshua Chang <j.cs.chang(a)gmail.com>, 2019 # 大圈洋蔥, 2016 # wenganli, 2015 # x4r <xatierlike(a)gmail.com>, 2014-2015 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2019-10-07 08:43+0200\n" -"PO-Revision-Date: 2019-10-07 13:48+0000\n" -"Last-Translator: erinm\n" +"POT-Creation-Date: 2019-10-21 09:06+0200\n" +"PO-Revision-Date: 2019-11-21 10:28+0000\n" +"Last-Translator: Joshua Chang <j.cs.chang(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "裝置 %s 是光學設備。" #: ../lib/Tails/Persistence/Setup.pm:444 #, perl-format msgid "Device %s was not created using a USB image or Tails Installer." -msgstr "" +msgstr "裝置 %s 並非使用 USB 映像檔或 Tails 安裝程式所建立。" #: ../lib/Tails/Persistence/Setup.pm:688 msgid "Persistence wizard - Finished"

1 0

[dip/master] Modify log directory for gitaly
by hiro＠torproject.org 21 Nov '19

21 Nov '19

commit 5e7d9ee089e4e07cbc1764a9c034f667b3e47a95 Author: hiro <hiro(a)torproject.org> Date: Thu Nov 21 17:32:30 2019 +0100 Modify log directory for gitaly --- roles/gitaly/templates/gitaly.toml.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index a392b19..d9e7046 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -33,6 +33,7 @@ path = "{{ ansible_user_dir }}/repositories" # # Additionally exceptions can be reported to Sentry # sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" level = "warn" +dir = "{{ ansible_user_dir }}/log/gitaly/" # # You can optionally configure Gitaly to record histogram latencies on GRPC method calls # [prometheus] @@ -44,10 +45,10 @@ dir = "{{ ansible_user_dir }}/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 300000000 -# +# # # Grace period before a gitaly-ruby process is forcibly terminated after exceeding max_rss (seconds) # graceful_restart_timeout = "10m" -# +# # # Time that gitaly-ruby memory must remain high before a restart (seconds) # restart_delay = "5m"

1 0

[translation-tools/master] this resource is now part of snowflakeaddon-messages.json
by emmapeel＠torproject.org 21 Nov '19

21 Nov '19

commit e67912a5d071ca4ad8dfc10e849b4a9496b51b0f Author: emma peel <emma.peel(a)riseup.net> Date: Thu Nov 21 16:11:48 2019 +0000 this resource is now part of snowflakeaddon-messages.json --- config | 1 - 1 file changed, 1 deletion(-) diff --git a/config b/config index 1e46bba..a26fc34 100644 --- a/config +++ b/config @@ -21,7 +21,6 @@ mat-gui mat-gui_completed orfox-stringsxml orfox-stringsxml_completed policies-code_of_conducttxtpot policies-code_of_conducttxtpot_completed snowflakeaddon-messages.json snowflakeaddon-messages.json_completed -snowflake-website-indexhtml snowflake-website-indexhtml_completed tails-misc tails-misc_completed tails-misc_release tails-iuk tails-iuk_completed tails-perl5lib tails-perl5lib_completed tails-greeter-2 tails-greeter-2_completed

1 0

[translation-tools/master] add gettor website
by emmapeel＠torproject.org 21 Nov '19

21 Nov '19

commit 7536191467fc65736e8227f1e1f53445e5a87098 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Oct 8 15:50:28 2019 +0000 add gettor website --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 092c016..1e46bba 100644 --- a/config +++ b/config @@ -14,6 +14,7 @@ bridgedb bridgedb_completed communitytpo-contentspot communitytpo-contentspot_completed donatepages-messagespot donatepages-messagespot_completed exoneratorproperties exoneratorproperties_completed +gettor-website-contentspot gettor-website-contentspot_completed https_everywhere https_everywhere_completed liveusb-creator liveusb-creator_completed mat-gui mat-gui_completed

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit 582ae97d3ab732d58eb7bb3758c19ea2d97932fa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 14:16:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ar/messages.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/messages.json b/ar/messages.json index 1f554ee9b..e65456bb8 100644 --- a/ar/messages.json +++ b/ar/messages.json @@ -57,24 +57,24 @@ "message": "الإبلاغ عن الأخطاء" }, "fileBug": { - "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to," + "message": "اذا واجهتك مشاكل مع Snowflake كعميل او كبروكسى، من فضلك انظر فى التبليغ عن خطأ. لكى تفعل ذلك، يجب عليك" }, "sharedAccount": { - "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared cypherpunks account with password writecode." + "message": "إما أن <a href=\"https://trac.torproject.org/projects/tor/register\">تُنشأ حسابا</a> أو تقوم <a href=\"https://trac.torproject.org/projects/tor/login\">بتسجيل الدخول</a> باستخدام الحساب المشارك cypherpunks واستخدام كلمة سر writecode." }, "bugTracker": { - "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker." + "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">أصدّر تذكرة ticket</a> باستخدام متتبع الأخطاء bug tracker الخاص بنا." }, "descriptive": { - "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords snowflake-webextension or snowflake-client to let us know how which part of the Snowflake system is experiencing problems." + "message": "من فضلك حاول أن تكون واضحا بأكثر قدر ممكن فى تَذكرَتك و اذا أمكن الحِق بها سجل الرسائل الذى سيساعدنا فى إعادة إنتاج الخطأ. انظر فى اضافة كلمات مفتاحية snowflake-webextension لإضافة الويب أو snowflake-clientللعميل لكى تسمح لنا بمعرفة أى جزء من نظام Snowflake يواجه مشاكل." }, "embed": { - "message": "Embed" + "message": "التضمين" }, "possible": { - "message": "It is now possible to embed the Snowflake badge on any website:" + "message": "الآن بامكانك أن تضمن إشارة Snowflake فى أي موقع:" }, "looksLike": { - "message": "Which looks like this:" + "message": "و التي تظهر على الشكل التالي:" } }

1 0

[dip/master] Update folder for secrets
by hiro＠torproject.org 21 Nov '19

21 Nov '19

commit 9ab5f5a09eb6af95c2bf00b963b848d625d455ff Author: hiro <hiro(a)torproject.org> Date: Thu Nov 21 14:54:41 2019 +0100 Update folder for secrets --- .gitmodules | 4 ++-- inventories/.gitignore | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9788653..85a091f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "inventories/prod/secrets"] - path = inventories/prod/secrets +[submodule "inventories/current/secrets/group_vars"] + path = inventories/current/secrets/group_vars url = https://git.torproject.org/admin/services/gitlab/dip-configs.git diff --git a/inventories/.gitignore b/inventories/.gitignore index a35503e..59206b6 100644 --- a/inventories/.gitignore +++ b/inventories/.gitignore @@ -1 +1 @@ -/current +inventories/current/secrets

1 0

[dip-configs/master] Update secrets file
by hiro＠torproject.org 21 Nov '19

21 Nov '19

commit 1842509d4808b3bac1715d44f565601a473f8fcf Author: hiro <hiro(a)torproject.org> Date: Thu Nov 21 14:55:30 2019 +0100 Update secrets file --- all.yml.sample | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/all.yml.sample b/all.yml.sample index 28569bd..0634dbc 100644 --- a/all.yml.sample +++ b/all.yml.sample @@ -1,3 +1,8 @@ --- docker_registry_auth_key: docker-registry-auth-key admin_token_ldapsync: admin-token-ldapsync +logs_password: logs-password +ldap_org: torproject +ldap_host: db.torproject.org +admin_token_ldapsync: admin-token-ldapsync +google_service_account:

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit a9467540238b479705ed31b3f2fc98af5f3c60bc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 13:46:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ar/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/messages.json b/ar/messages.json index 77c9d6d91..1f554ee9b 100644 --- a/ar/messages.json +++ b/ar/messages.json @@ -45,16 +45,16 @@ "message": "إضافة" }, "installExtension": { - "message": "If your internet access is not censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours." + "message": "اذا كان اتصالك بالإنترنت غير مراقب، يجب عليك أن تنظر فى تثبيت إضافة Snowflake لمساعدة المستخدمين فى الشبكات المراقبة. ليس عليك أن تقلق من المواقع التى يدخل إليها الناس من خلال البروكسى الخاص بك. عنوان IP الظاهر سيكون مطابقا لعقدة مخرج تور Tor exit node و ليس عنوانك." }, "installFirefox": { - "message": "Install in Firefox" + "message": "تثبيت فى فَيَرْفُكْسْ Firefox" }, "installChrome": { - "message": "Install in Chrome" + "message": "تثبيت فى كُروم Chrome" }, "reportingBugs": { - "message": "Reporting Bugs" + "message": "الإبلاغ عن الأخطاء" }, "fileBug": { "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to,"

1 0

[tor/master] config.md: suggestions from teor
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit 55fac8dafc78d1f9ea6b15f2eadc0975ade9667d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 21 08:26:12 2019 -0500 config.md: suggestions from teor --- src/lib/conf/config.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/conf/config.md b/src/lib/conf/config.md index 4dff316dc..7741e21f4 100644 --- a/src/lib/conf/config.md +++ b/src/lib/conf/config.md @@ -48,12 +48,12 @@ usage, see crypto_options.inc or mainloop_state.inc. After using those macros, you must tell the subsystem management code about your module's configuration/state. -If you're writing configuration code, you'll need a function that -receives the configuration object, and acts upon it. This function -needs to be safe to call multiple times, since Tor will reconfigure -its subsystems whenever it, or whenever it restarts in process. -This function goes in your subsystem's subsys_fns_t.set_options -field. +If you're writing configuration code, you'll need a function that receives +the configuration object, and acts upon it. This function needs to be safe +to call multiple times, since Tor will reconfigure its subsystems whenever it +re-reads the torrc, gets a configuration change from a controller, or +restarts in process. This function goes in your subsystem's +subsys_fns_t.set_options field. If you're writing state code, you'll need a function that receives state (subsys_fns_t.set_state), and a function that flushes the @@ -89,10 +89,10 @@ subsystem manager code (subsysmgr.c) to pass the corresponding configuration or state objects to each module that has one. Note that the top level code does not have easy access to the -configuration objects used by the sub-modules. This is by design. -A module _may_ expose its configuration or state object, if it -likes, but if it does not, that object should be considered -module-local. +configuration objects used by the sub-modules. This is by design. A +module _may_ expose some or all of its configuration or state object via +accessor functions, if it likes, but if it does not, that object should +be considered module-local. ## Adding new types @@ -113,8 +113,8 @@ used with the macros in confdecl.h. ## Legacy configuration and state -As of this writing, most of the configuration and state is still -handled directly in config.c and statefile.c, and stored in the +As of this writing (November 2019), most of the configuration and state is +still handled directly in config.c and statefile.c, and stored in the monolithic structures or_options_t and or_state_t respectively. These top-level structures are accessed with get_options() and

1 0

[tor/master] High-level documentation of configuration in Tor.
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit 0e4e96b9bf56d3fdbd8db7b4cf5b66b4a34bf4d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 15 10:49:25 2019 -0500 High-level documentation of configuration in Tor. Closes ticket 32209. --- src/lib/conf/config.md | 126 +++++++++++++++++++++++++++++++++++++++++++++++++ src/mainpage.md | 3 +- 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/src/lib/conf/config.md b/src/lib/conf/config.md new file mode 100644 index 000000000..4dff316dc --- /dev/null +++ b/src/lib/conf/config.md @@ -0,0 +1,126 @@ + +@page configuration Configuration options and persistent state + +@tableofcontents + +## Introduction + +Tor uses a shared, table-driven mechanism to handle its +configuration (torrc) files and its state files. Each module can +declare a set of named fields for these files, and get notified +whenever the configuration changes, or when the state is about to be +flushed to disk. + +## Declaring options + +Most modules will only need to use the macros in confdecl.h to +declare a configuration or state structure. + +You'll write something like this: + + // my_module_config.inc + BEGIN_CONF_STRUCT(module_options_t) + CONF_VAR(FieldOne, INT, 0, "7") + CONF_VAR(FieldTwo, STRING, 0, NULL) + END_CONF_STRUCT(module_options_t) + +The above example will result in a structure called module_config_t +with two fields: one an integer called FieldOne and one a string +called FieldTwo. The integer gets a default value of 7; the +string's default value is NULL. + +After making a definition file like that, you include it twice: once +in a header, after saying \#define CONF_CONTEXT STRUCT, and once in +a C file, after saying \#define CONF_CONTEXT TABLE. The first time +defines a module_options_t structure, and the second time defines a +table that tells the configuration manager how to use it. + +Using the table, you declare a `const` config_format_t, which +associates the fields with a set of functions for validating and +normalizing them, a list of abbreviations and deprecations, and +other features. + +See confdecl.h and conftypes.h for more information. For example +usage, see crypto_options.inc or mainloop_state.inc. + +## Getting notifications + +After using those macros, you must tell the subsystem management +code about your module's configuration/state. + +If you're writing configuration code, you'll need a function that +receives the configuration object, and acts upon it. This function +needs to be safe to call multiple times, since Tor will reconfigure +its subsystems whenever it, or whenever it restarts in process. +This function goes in your subsystem's subsys_fns_t.set_options +field. + +If you're writing state code, you'll need a function that receives +state (subsys_fns_t.set_state), and a function that flushes the +application state into a state object (subsys_fns_t.flush_state). +The `set_state` function will be called once (@ref config_once_per +"1") when Tor is starting, whereas the `flush_state` function will +be called whenever Tor is about to save the state to disk. + +See subsys_fns_t for more information here, and \ref initialization +for more information about initialization and subsystems in general. + +> @anchor config_once_per 1. Technically, state is set once _per startup_. +> Remember that Tor can be stopped and started multiple times in +> the same process. If this happens, then your set_state() function +> is called once every time Tor starts. + +## How it works + +The common logic used to handle configuration and state files lives +in @refdir{lib/confmgt}. At the highest level, a configuration +manager object (config_mgr_t) maintains a list of each module's +configuration objects, and a list of all their fields. When the +user specifies a configuration value, the manager finds out how to +parse it, where to store it, and which configuration object is +affected. + +The top-level configuration module (config.c) and state module +(statefile.c) use config_mgr_t to create, initialize, set, compare, +and free a "top level configuration object". This object contains a +list of sub-objects: one for each module that participates in the +configuration/state system. This top-level code then invokes the +subsystem manager code (subsysmgr.c) to pass the corresponding +configuration or state objects to each module that has one. + +Note that the top level code does not have easy access to the +configuration objects used by the sub-modules. This is by design. +A module _may_ expose its configuration or state object, if it +likes, but if it does not, that object should be considered +module-local. + +## Adding new types + +Configuration and state fields each have a "type". These types +specify how the fields' values are represented in C; how they are +stored in files; and how they are encoded back and forth. + +There is a set of built-in types listed in conftypes.h, but +higher-level code can define its own types. To do so, you make an +instance of var_type_fns_t that describes how to manage your type, +and an instance of var_type_def_t that wraps your var_type_fns_t +with a name and optional parameters and flags. + +For an example of how a higher-level type is defined, see +ROUTERSET_type_defn in routerset.c. Also see the typedef +`config_decl_ROUTERSET`. Together, these let the routerset type be +used with the macros in confdecl.h. + +## Legacy configuration and state + +As of this writing, most of the configuration and state is still +handled directly in config.c and statefile.c, and stored in the +monolithic structures or_options_t and or_state_t respectively. + +These top-level structures are accessed with get_options() and +get_state(), and used throughout much of the code, at the level of +@refdir{core} and higher. + +With time we hope to refactor this configuration into more +reasonable pieces, so that they are no longer (effectively) global +variables used throughout the code. diff --git a/src/mainpage.md b/src/mainpage.md index a2c5ec630..c5cb1af23 100644 --- a/src/mainpage.md +++ b/src/mainpage.md @@ -41,6 +41,8 @@ Tor repository. @subpage time_periodic +@subpage configuration + @page intro A high-level overview @@ -140,4 +142,3 @@ more connection types. A 'Node' (node_t) is a view of a Tor instance's current knowledge and opinions about a Tor relay or bridge. -

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2019