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

[tor/master] confparse: Add a function to check the magic of a toplevel object.
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit aa6b4b62db0ef9e0e9e4c9d716d7b860f8f4a238 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 25 08:08:43 2019 -0400 confparse: Add a function to check the magic of a toplevel object. --- src/lib/confmgt/confparse.c | 11 +++++++++++ src/lib/confmgt/confparse.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/lib/confmgt/confparse.c b/src/lib/confmgt/confparse.c index 655fc3483..b08dc26da 100644 --- a/src/lib/confmgt/confparse.c +++ b/src/lib/confmgt/confparse.c @@ -334,6 +334,17 @@ config_mgr_list_deprecated_vars(const config_mgr_t *mgr) return result; } +/** + * Check the magic number on object to make sure it's a valid toplevel + * object, created with mgr. Exit with an assertion if it isn't. + **/ +void +config_check_toplevel_magic(const config_mgr_t *mgr, + const void *object) +{ + struct_check_magic(object, &mgr->toplevel_magic); +} + /** Assert that the magic fields in options and its subsidiary * objects are all okay. */ static void diff --git a/src/lib/confmgt/confparse.h b/src/lib/confmgt/confparse.h index 7829f1aeb..f187bfc38 100644 --- a/src/lib/confmgt/confparse.h +++ b/src/lib/confmgt/confparse.h @@ -232,6 +232,8 @@ void *config_dup(const config_mgr_t *mgr, const void *old); char *config_dump(const config_mgr_t *mgr, const void *default_options, const void *options, int minimal, int comment_defaults); +void config_check_toplevel_magic(const config_mgr_t *mgr, + const void *object); bool config_check_ok(const config_mgr_t *mgr, const void *options, int severity); int config_assign(const config_mgr_t *mgr, void *options,

1 0

[tor/master] Extend confmgr tests to handle validation callbacks.
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit f796bf3aa5f42451db9a7b8be10e97cb17b2f54c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 24 17:35:15 2019 -0400 Extend confmgr tests to handle validation callbacks. --- src/test/test_confmgr.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c index d5c73b48e..bcacfe953 100644 --- a/src/test/test_confmgr.c +++ b/src/test/test_confmgr.c @@ -43,6 +43,8 @@ typedef struct { int fuzziness; char *alpacaname; int n_wings; /* deprecated; alpacas don't have wings. */ + + int square_fuzziness; /* Derived from fuzziness. */ } alpaca_cfg_t; /* @@ -105,6 +107,84 @@ static config_abbrev_t llama_abbrevs[] = { { NULL, NULL, 0, 0 }, }; +static int +legacy_validate_pasture(const void *old_, void *obj, char **msg_out) +{ + const pasture_cfg_t *old = old_; + pasture_cfg_t *p = obj; + + // llamas can't find their way home if the letters are lowercase. + if (p->address) + tor_strupper(p->address); + + if (old && old->address && + (!p->address || strcmp(old->address, p->address))) { + *msg_out = tor_strdup("You can't move a pasture."); + return -1; + } + + return 0; +} + +static int +validate_llama(const void *obj, char **msg_out) +{ + const llama_cfg_t *llama = obj; + tor_assert(llama->magic == 0x11aa11); + + if (! llama->llamaname || strlen(llama->llamaname) == 0) { + *msg_out = tor_strdup("A llama has no name!?"); + return -1; + } + + if (strspn(llama->llamaname, "0123456789") == strlen(llama->llamaname)) { + *msg_out = tor_strdup("It is not a number; it is a free llama!"); + return -1; + } + + return 0; +} + +static int +check_transition_alpaca(const void *old_, const void *new_, char **msg_out) +{ + const alpaca_cfg_t *old_alpaca = old_; + const alpaca_cfg_t *new_alpaca = new_; + + tor_assert(old_alpaca && new_alpaca); + tor_assert(old_alpaca->magic == 0xa15aca); + tor_assert(new_alpaca->magic == 0xa15aca); + + if (old_alpaca->fuzziness > new_alpaca->fuzziness) { + *msg_out = tor_strdup("An alpaca only becomes more fuzzy over time."); + return -1; + } + + return 0; +} + +static int +post_normalize_llama(void *obj, char **msg_out) +{ + (void)msg_out; + llama_cfg_t *llama = obj; + tor_assert(llama->magic == 0x11aa11); + tor_assert(llama->llamaname); // we have already checked for a NULL name. + tor_free(llama->description); + tor_asprintf(&llama->description, "A llama called %s.", llama->llamaname); + return 0; +} + +static int +pre_normalize_alpaca(void *obj, char **msg_out) +{ + (void)msg_out; + alpaca_cfg_t *alpaca = obj; + tor_assert(alpaca->magic == 0xa15aca); + alpaca->square_fuzziness = alpaca->fuzziness * alpaca->fuzziness; + return 0; +} + static const config_format_t pasture_fmt = { sizeof(pasture_cfg_t), { @@ -114,6 +194,7 @@ static const config_format_t pasture_fmt = { }, .vars = pasture_vars, .config_suite_offset = offsetof(pasture_cfg_t, subobjs), + .legacy_validate_fn = legacy_validate_pasture, }; static const config_format_t llama_fmt = { @@ -128,6 +209,8 @@ static const config_format_t llama_fmt = { .deprecations = llama_deprecations, .abbrevs = llama_abbrevs, .clear_fn = clear_llama_cfg, + .validate_fn = validate_llama, + .post_normalize_fn = post_normalize_llama, }; static const config_format_t alpaca_fmt = { @@ -140,6 +223,8 @@ static const config_format_t alpaca_fmt = { .vars = alpaca_vars, .config_suite_offset = -1, .deprecations = alpaca_deprecations, + .pre_normalize_fn = pre_normalize_alpaca, + .check_transition_fn = check_transition_alpaca, }; #define LLAMA_IDX 0 @@ -313,6 +398,95 @@ test_confmgr_dump(void *arg) tor_free(s); } +static pasture_cfg_t * +parse_and_validate(config_mgr_t *mgr, + const char *inp, const pasture_cfg_t *old, char **msg_out) +{ + pasture_cfg_t *p = config_new(mgr); + pasture_cfg_t *result = NULL; + config_line_t *lines = NULL; + + config_init(mgr, p); // set defaults. + int r = config_get_lines(inp, &lines, 0); + tt_int_op(r, OP_EQ, 0); + r = config_assign(mgr, p, lines, 0, msg_out); + tt_int_op(r, OP_EQ, 0); + tor_free(*msg_out); // sets it to NULL + r = config_validate(mgr, old, p, msg_out); + if (r < 0) + goto done; + + tt_ptr_op(*msg_out, OP_EQ, NULL); + result = p; + p = NULL; // prevent free + done: + config_free(mgr, p); + config_free_lines(lines); + return result; +} + +static void +test_confmgr_validate(void *arg) +{ + (void)arg; + char *msg = NULL; + config_mgr_t *mgr = get_mgr(true); + pasture_cfg_t *p_orig, *p=NULL; + + p_orig = parse_and_validate(mgr, "Llamaname Quest\n" + "Address 99 camelid way\n" + "Fuzziness 8\n", NULL, &msg); + tt_assert(p_orig); + + // Make sure normalization code was run. + const alpaca_cfg_t *ac0 = config_mgr_get_obj(mgr, p_orig, ALPACA_IDX); + const llama_cfg_t *lc0 = config_mgr_get_obj(mgr, p_orig, LLAMA_IDX); + tt_int_op(ac0->fuzziness, OP_EQ, 8); + tt_int_op(ac0->square_fuzziness, OP_EQ, 64); + tt_str_op(lc0->description, OP_EQ, "A llama called Quest."); + tt_str_op(p_orig->address, OP_EQ, "99 CAMELID WAY"); + + // try a bad llamaname. + p = parse_and_validate(mgr, "llamaname 123", p_orig, &msg); + tt_assert(!p); + tt_str_op(msg, OP_EQ, "It is not a number; it is a free llama!"); + tor_free(msg); + + // try a llamaname that would crash the post_normalize step, if it ran. + p = parse_and_validate(mgr, "", p_orig, &msg); + tt_assert(!p); + tt_str_op(msg, OP_EQ, "A llama has no name!?"); + tor_free(msg); + + // Verify that a transition to a less fuzzy alpaca fails. + p = parse_and_validate(mgr, "Llamaname Quest\n" + "Address 99 camelid way\n" + "Fuzziness 4\n", p_orig, &msg); + tt_assert(!p); + tt_str_op(msg, OP_EQ, "An alpaca only becomes more fuzzy over time."); + tor_free(msg); + + // Try a transition to a more fuzzy alpaca; it should work fine. + p = parse_and_validate(mgr, "Llamaname Mercutio\n" + // the default fuzziness is 50 + "Address 99 camelid way\n", p_orig, &msg); + tt_assert(p); + config_free(mgr, p); + + // Verify that we can't move the pasture. + p = parse_and_validate(mgr, "Llamaname Montague\n" + // the default fuzziness is 50 + "Address 99 ungulate st\n", p_orig, &msg); + tt_assert(!p); + tt_str_op(msg, OP_EQ, "You can't move a pasture."); + + done: + config_free(mgr, p); + config_free(mgr, p_orig); + config_mgr_free(mgr); + tor_free(msg); +} + #define CONFMGR_TEST(name, flags) \ { #name, test_confmgr_ ## name, flags, NULL, NULL } @@ -321,5 +495,6 @@ struct testcase_t confmgr_tests[] = { CONFMGR_TEST(magic, 0), CONFMGR_TEST(parse, 0), CONFMGR_TEST(dump, 0), + CONFMGR_TEST(validate, 0), END_OF_TESTCASES };

1 0

[tor/master] config: make options_act*() mockable.
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit 4d53bbeafb70735690058ccc8acfb81366e7f579 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 24 20:16:10 2019 -0400 config: make options_act*() mockable. I'll need this for testing options_trial_assign(). --- src/app/config/config.c | 10 +++++----- src/app/config/config.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1041b6b6a..b6927b8b7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -822,7 +822,7 @@ static const config_deprecation_t option_deprecation_notes_[] = { #ifdef _WIN32 static char *get_windows_conf_root(void); #endif -static int options_act_reversible(const or_options_t *old_options, char **msg); + static int options_check_transition_cb(const void *old, const void *new, char **msg); @@ -1428,8 +1428,8 @@ static int have_low_ports = -1; * * Return 0 if all goes well, return -1 if things went badly. */ -static int -options_act_reversible(const or_options_t *old_options, char **msg) +MOCK_IMPL(STATIC int, +options_act_reversible,(const or_options_t *old_options, char **msg)) { smartlist_t *new_listeners = smartlist_new(); or_options_t *options = get_options_mutable(); @@ -1857,8 +1857,8 @@ options_transition_affects_dirauth_timing(const or_options_t *old_options, * Note: We haven't moved all the "act on new configuration" logic * here yet. Some is still in do_hup() and other places. */ -STATIC int -options_act(const or_options_t *old_options) +MOCK_IMPL(STATIC int, +options_act,(const or_options_t *old_options)) { config_line_t *cl; or_options_t *options = get_options_mutable(); diff --git a/src/app/config/config.h b/src/app/config/config.h index 2badc1af9..9cc77e2c6 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -264,7 +264,9 @@ int options_any_client_port_set(const or_options_t *options); #define CL_PORT_IS_UNIXSOCKET (1u<<6) #define CL_PORT_DFLT_GROUP_WRITABLE (1u<<7) -STATIC int options_act(const or_options_t *old_options); +MOCK_DECL(STATIC int, options_act,(const or_options_t *old_options)); +MOCK_DECL(STATIC int, options_act_reversible,(const or_options_t *old_options, + char **msg)); struct config_mgr_t; STATIC const struct config_mgr_t *get_options_mgr(void);

1 0

[tor/master] config, state: check magic in all callbacks.
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit 63f2a310cbeb5908a202ba17da7e66535c77c894 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 25 08:09:05 2019 -0400 config,state: check magic in all callbacks. --- src/app/config/config.c | 11 +++++++++++ src/app/config/statefile.c | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index b6927b8b7..f2db0e525 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -921,6 +921,10 @@ get_options_mgr(void) return options_mgr; } +#define CHECK_OPTIONS_MAGIC(opt) STMT_BEGIN \ + config_check_toplevel_magic(get_options_mgr(), (opt)); \ + STMT_END + /** Return the contents of our frontpage string, or NULL if not configured. */ MOCK_IMPL(const char*, get_dirportfrontpage, (void)) @@ -1027,6 +1031,7 @@ static void options_clear_cb(const config_mgr_t *mgr, void *opts) { (void)mgr; + CHECK_OPTIONS_MAGIC(opts); or_options_t *options = opts; routerset_free(options->ExcludeExitNodesUnion_); @@ -3467,6 +3472,9 @@ options_validate_single_onion(or_options_t *options, char **msg) static int options_validate_cb(const void *old_options_, void *options_, char **msg) { + if (old_options_) + CHECK_OPTIONS_MAGIC(old_options_); + CHECK_OPTIONS_MAGIC(options_); const or_options_t *old_options = old_options_; or_options_t *options = options_; @@ -4821,6 +4829,9 @@ options_check_transition_cb(const void *old_, const void *new_val_, char **msg) { + CHECK_OPTIONS_MAGIC(old_); + CHECK_OPTIONS_MAGIC(new_val_); + const or_options_t *old = old_; const or_options_t *new_val = new_val_; diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index d3a0ec179..834ad93ed 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -184,6 +184,10 @@ get_state_mgr(void) return state_mgr; } +#define CHECK_STATE_MAGIC(s) STMT_BEGIN \ + config_check_toplevel_magic(get_state_mgr(), (s)); \ + STMT_END + /** Persistent serialized state. */ static or_state_t *global_state = NULL; @@ -286,6 +290,7 @@ or_state_validate_cb(const void *old_state, void *state_, char **msg) /* There is not a meaningful concept of a state-to-state transition, * since we do not reload the state after we start. */ (void) old_state; + CHECK_STATE_MAGIC(state_); or_state_t *state = state_;

1 0

[tor/master] Merge branch 'ticket31241_v3'
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit e7993dc046a099075bc5f9f65a7bb1601686d03c Merge: 0ae530c8f 63f2a310c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 25 08:10:39 2019 -0400 Merge branch 'ticket31241_v3' changes/ticket31241 | 5 + scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 190 ++++++---- src/app/config/config.h | 13 +- src/app/config/statefile.c | 47 ++- src/feature/dirauth/shared_random_state.c | 32 +- src/lib/confmgt/confparse.c | 112 +++++- src/lib/confmgt/confparse.h | 87 ++++- src/test/test_confmgr.c | 175 +++++++++ src/test/test_confparse.c | 33 +- src/test/test_options.c | 604 +++++++++++++++++------------- src/test/testing_common.c | 1 + 12 files changed, 872 insertions(+), 429 deletions(-)

1 0

[tor/master] Use named-member syntax for initializing config_format_t objects
by nickm＠torproject.org 25 Oct '19

25 Oct '19

commit 27dbf20bf477d3793d295b376713f71bccc7acaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:43:50 2019 -0400 Use named-member syntax for initializing config_format_t objects I'm about to mess with their lists of callbacks, and I don't want to proliferate lists where we say "NULL, NULL, NULL, ..." --- src/app/config/config.c | 17 ++++++++-------- src/app/config/statefile.c | 16 +++++++-------- src/feature/dirauth/shared_random_state.c | 15 ++++++-------- src/test/test_confparse.c | 33 ++++++++++++++----------------- 4 files changed, 36 insertions(+), 45 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 187c27559..aafc8c5a7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -864,19 +864,18 @@ static void options_clear_cb(const config_mgr_t *mgr, void *opts); /** Configuration format for or_options_t. */ static const config_format_t options_format = { - sizeof(or_options_t), - { + .size = sizeof(or_options_t), + .magic = { "or_options_t", OR_OPTIONS_MAGIC, offsetof(or_options_t, magic_), }, - option_abbrevs_, - option_deprecation_notes_, - option_vars_, - options_validate_cb, - options_clear_cb, - NULL, - offsetof(or_options_t, subconfigs_), + .abbrevs = option_abbrevs_, + .deprecations = option_deprecation_notes_, + .vars = option_vars_, + .validate_fn = options_validate_cb, + .clear_fn = options_clear_cb, + .config_suite_offset = offsetof(or_options_t, subconfigs_), }; /* diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 5c2e37490..2e5edc41c 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -157,19 +157,17 @@ static struct_member_t state_extra_var = { /** Configuration format for or_state_t. */ static const config_format_t state_format = { - sizeof(or_state_t), - { + .size = sizeof(or_state_t), + .magic = { "or_state_t", OR_STATE_MAGIC, offsetof(or_state_t, magic_), }, - state_abbrevs_, - NULL, - state_vars_, - or_state_validate_cb, - NULL, - &state_extra_var, - offsetof(or_state_t, substates_), + .abbrevs = state_abbrevs_, + .vars = state_vars_, + .validate_fn = or_state_validate_cb, + .extra = &state_extra_var, + .config_suite_offset = offsetof(or_state_t, substates_), }; /* A global configuration manager for state-file objects */ diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 94743fdb7..2070e03aa 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -87,19 +87,16 @@ static const struct_member_t state_extra_var = { /** Configuration format of sr_disk_state_t. */ static const config_format_t state_format = { - sizeof(sr_disk_state_t), - { + .size = sizeof(sr_disk_state_t), + .magic = { "sr_disk_state_t", SR_DISK_STATE_MAGIC, offsetof(sr_disk_state_t, magic_), }, - NULL, - NULL, - state_vars, - disk_state_validate_cb, - NULL, - &state_extra_var, - -1, + .vars = state_vars, + .validate_fn = disk_state_validate_cb, + .extra = &state_extra_var, + .config_suite_offset = -1, }; /** Global configuration manager for the shared-random state file */ diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 6702f3439..8cda96ba5 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -119,19 +119,17 @@ test_validate_cb(const void *old_options, void *options, char **msg) #define TEST_MAGIC 0x1337 static const config_format_t test_fmt = { - sizeof(test_struct_t), - { + .size = sizeof(test_struct_t), + .magic = { "test_struct_t", TEST_MAGIC, offsetof(test_struct_t, magic), }, - test_abbrevs, - test_deprecation_notes, - test_vars, - test_validate_cb, - NULL, - NULL, - -1, + .abbrevs = test_abbrevs, + .deprecations = test_deprecation_notes, + .vars = test_vars, + .validate_fn = test_validate_cb, + .config_suite_offset = -1, }; /* Make sure that config_init sets everything to the right defaults. */ @@ -815,19 +813,18 @@ static struct_member_t extra = { }; static config_format_t etest_fmt = { - sizeof(test_struct_t), - { + .size = sizeof(test_struct_t), + .magic = { "test_struct_t (with extra lines)", ETEST_MAGIC, offsetof(test_struct_t, magic), }, - test_abbrevs, - test_deprecation_notes, - test_vars, - test_validate_cb, - NULL, - &extra, - -1, + .abbrevs = test_abbrevs, + .deprecations = test_deprecation_notes, + .vars = test_vars, + .validate_fn = test_validate_cb, + .extra = &extra, + .config_suite_offset = -1, }; /* Try out the feature where we can store unrecognized lines and dump them

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 25 Oct '19

25 Oct '19

commit f6eb462804afcad1ef191ca93a5f1478f3eab1d0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 12:15:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- nl/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index c3c6774c7..349f8da51 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 07:51+0000\n" +"PO-Revision-Date: 2019-10-25 12:07+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 25 Oct '19

25 Oct '19

commit 8d39078dcb51e28432ed8b2cb9233c1dac17c57c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 12:15:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- nl/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index f730a4357..fb527221b 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 07:51+0000\n" +"PO-Revision-Date: 2019-10-25 12:07+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Er zijn ook een aantal bridges met IPv6-adressen beschikbaar, hoewel sommige Pluggable\nTransports niet IPv6-compatibel zijn.\n\n" +msgstr "Er zijn ook enkele bridges met IPv6-adressen beschikbaar, hoewel sommige Pluggable\nTransports niet IPv6-compatibel zijn.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 25 Oct '19

25 Oct '19

commit 248ea9642f431eed050d6be38bbb1f2e85e73a34 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 11:52:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+nl.po b/contents+nl.po index 3688e7729..57d329ac7 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -812,7 +812,8 @@ msgstr "Schijf u in voor onze nieuwsbrief" #: lego/templates/footer.html:55 templates/footer.html:55 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "Ontvang maandelijkse nieuwtjes en kansen van het Tor Project:" +msgstr "" +"Ontvang maandelijkse updates en mogelijkheden omtrent het Tor Project:" #: lego/templates/footer.html:56 templates/footer.html:56 msgid "Sign up"

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 25 Oct '19

25 Oct '19

commit 42f0949e31e5d929047fe1ffdf5eabf70031422f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 11:52:07 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- nl/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index 595004b74..8bc6dfd2a 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-10-22 21:18+0000\n" -"Last-Translator: Meteor 0id\n" +"PO-Revision-Date: 2019-10-25 11:34+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +73,7 @@ msgstr "Meer informatie over deze uitgangslocatie, bekijk:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Het Tor Project is een 501(c)(3)-organisatie zonder winstoogmerk gevestigd in de VS die zich inzet voor onderzoek, ontwikkeling en onderwijs over online anonimiteit en privacy." +msgstr "Het Tor Project is een 501(c)(3)-non-profitorganisatie in de VS die zich inzet voor onderzoek, ontwikkeling en onderwijs van en in online anonimiteit en privacy." msgid "Learn More »" msgstr "Meer info »"

1 0