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

[tor/master] relay/dirauth: Set some output arguments in stubs
by nickm＠torproject.org 20 Mar '20

20 Mar '20

commit d4a74021e5ab9dbaf3bb27c0a52e1fd7f8f792ab Author: teor <teor(a)torproject.org> Date: Fri Mar 20 17:01:06 2020 +1000 relay/dirauth: Set some output arguments in stubs And document how some functions set their output arguments. Fixes bug 33674; bugfix on 0.4.3.1-alpha. --- changes/bug33674 | 4 ++++ src/feature/dirauth/dirauth_config.h | 10 ++++++++-- src/feature/dirauth/dirvote.c | 24 ++++++++++++++++++++---- src/feature/dirauth/dirvote.h | 2 +- src/feature/dirauth/process_descs.c | 8 +++++--- src/feature/dirauth/process_descs.h | 11 ++++++----- src/feature/relay/relay_config.c | 7 ++++--- 7 files changed, 48 insertions(+), 18 deletions(-) diff --git a/changes/bug33674 b/changes/bug33674 new file mode 100644 index 000000000..bcc3fcab0 --- /dev/null +++ b/changes/bug33674 @@ -0,0 +1,4 @@ + o Minor bugfixes (--disable-module-relay,--disable-module-dirauth): + - Set some output arguments in the relay and dirauth module stubs, to + guard against future stub argument handling bugs like 33668. + Fixes bug 33674; bugfix on 0.4.3.1-alpha. diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index ede1207a8..9042ff877 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -75,8 +75,14 @@ options_validate_dirauth_mode(const struct or_options_t *old_options, #define options_act_dirauth_mtbf(old_options) \ (((void)(old_options)),0) -#define options_act_dirauth_stats(old_options, print_notice_out) \ - (((void)(old_options)),((void)(print_notice_out)),0) +static inline int +options_act_dirauth_stats(const struct or_options_t *old_options, + bool *print_notice_out) +{ + (void)old_options; + *print_notice_out = 0; + return 0; +} #define dirauth_should_reject_requests_under_load() (false) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 9490867e8..e230815ca 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -2527,9 +2527,12 @@ compute_consensus_package_lines(smartlist_t *votes) * any new signatures in src_voter_list that should be added to * target. (A signature should be added if we have no signature for that * voter in target yet, or if we have no verifiable signature and the - * new signature is verifiable.) Return the number of signatures added or - * changed, or -1 if the document signed by sigs isn't the same - * document as target. */ + * new signature is verifiable.) + * + * Return the number of signatures added or changed, or -1 if the document + * signatures are invalid. Sets *msg_out to a string constant + * describing the signature status. + */ STATIC int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, @@ -3564,6 +3567,14 @@ dirvote_add_signatures_to_pending_consensus( return r; } +/** Helper: we just got the detached_signatures_body sent to us as + * signatures on the currently pending consensus. Add them to the pending + * consensus (if we have one). + * + * Set *msg to a string constant describing the status, regardless of + * success or failure. + * + * Return negative on failure, nonnegative on success. */ static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, @@ -3626,7 +3637,12 @@ dirvote_add_signatures_to_all_pending_consensuses( /** Helper: we just got the detached_signatures_body sent to us as * signatures on the currently pending consensus. Add them to the pending * consensus (if we have one); otherwise queue them until we have a - * consensus. Return negative on failure, nonnegative on success. */ + * consensus. + * + * Set *msg to a string constant describing the status, regardless of + * success or failure. + * + * Return negative on failure, nonnegative on success. */ int dirvote_add_signatures(const char *detached_signatures_body, const char *source, diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index f695e93ab..675f4ee14 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -162,7 +162,7 @@ dirvote_add_signatures(const char *detached_signatures_body, { (void) detached_signatures_body; (void) source; - (void) msg_out; + *msg_out = "No directory authority support"; /* If the dirauth module is disabled, this should NEVER be called else we * failed to safeguard the dirauth module. */ tor_assert_nonfatal_unreached(); diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 5c918ca0b..5025d0ae3 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -285,7 +285,7 @@ dirserv_load_fingerprint_file(void) * Return the appropriate router status. * * If the status is 'RTR_REJECT' and msg is provided, set - * *msg to an explanation of why. */ + * *msg to a string constant explaining why. */ uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity) @@ -563,7 +563,8 @@ dirserv_router_has_valid_address(routerinfo_t *ri) /** Check whether we, as a directory server, want to accept ri. If so, * set its is_valid,running fields and return 0. Otherwise, return -1. * - * If the router is rejected, set *msg to an explanation of why. + * If the router is rejected, set *msg to a string constant explining + * why. * * If complain then explain at log-level 'notice' why we refused * a descriptor; else explain at log-level 'info'. @@ -729,7 +730,8 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, * That means the caller must not access ri after this function * returns, since it might have been freed. * - * Return the status of the operation. + * Return the status of the operation, and set *msg to a string + * constant describing the status. * * This function is only called when fresh descriptors are posted, not when * we re-load the cache. diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 9c1369277..1461ab697 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -98,7 +98,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, (void)desclen; (void)purpose; (void)source; - (void)msg; + *msg = "No directory authority support"; return (enum was_router_added_t)0; } static inline enum was_router_added_t @@ -107,8 +107,8 @@ dirserv_add_descriptor(routerinfo_t *ri, const char *source) { (void)ri; - (void)msg; (void)source; + *msg = "No directory authority support"; return (enum was_router_added_t)0; } static inline int @@ -125,9 +125,9 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, int *valid_out) { (void)ri; - (void)msg; (void)complain; - (void)valid_out; + *msg = "No directory authority support"; + *valid_out = 0; return 0; } static inline int @@ -143,8 +143,9 @@ dirserv_router_get_status(const routerinfo_t *router, int severity) { (void)router; - (void)msg; (void)severity; + if (msg) + *msg = "No directory authority support"; return 0; } static inline void diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index c8b40ae05..3e9961f47 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -231,8 +231,8 @@ check_server_ports(const smartlist_t *ports, } /** Parse all relay ports from options. On success, add parsed ports to - * ports, and return 0. On failure, set *msg to a description - * of the problem and return -1. + * ports, and return 0. On failure, set *msg to a newly + * allocated string describing the problem, and return -1. **/ int port_parse_ports_relay(or_options_t *options, @@ -334,7 +334,8 @@ port_update_port_set_relay(or_options_t *options, * Legacy validation function, which checks that the current OS is usable in * relay mode, if options is set to a relay mode. * - * Warns about OSes with potential issues. Always returns 0. + * Warns about OSes with potential issues. Does not set *msg. + * Always returns 0. */ int options_validate_relay_os(const or_options_t *old_options,

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 20 Mar '20

20 Mar '20

commit 3e24bd5557e2769195f6ef0100e131cda9df0943 Merge: 2f1f3b170 d4a74021e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 20 07:56:42 2020 -0400 Merge branch 'maint-0.4.3' changes/bug33668 | 4 ++++ changes/bug33674 | 4 ++++ src/feature/dirauth/dirauth_config.h | 10 ++++++++-- src/feature/dirauth/dirvote.c | 24 ++++++++++++++++++++---- src/feature/dirauth/dirvote.h | 2 +- src/feature/dirauth/process_descs.c | 8 +++++--- src/feature/dirauth/process_descs.h | 11 ++++++----- src/feature/relay/relay_config.c | 7 ++++--- src/feature/relay/relay_config.h | 17 ++++++++++++++--- 9 files changed, 66 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.4.3] relay/dirauth: Set some output arguments in stubs
by nickm＠torproject.org 20 Mar '20

20 Mar '20

commit d4a74021e5ab9dbaf3bb27c0a52e1fd7f8f792ab Author: teor <teor(a)torproject.org> Date: Fri Mar 20 17:01:06 2020 +1000 relay/dirauth: Set some output arguments in stubs And document how some functions set their output arguments. Fixes bug 33674; bugfix on 0.4.3.1-alpha. --- changes/bug33674 | 4 ++++ src/feature/dirauth/dirauth_config.h | 10 ++++++++-- src/feature/dirauth/dirvote.c | 24 ++++++++++++++++++++---- src/feature/dirauth/dirvote.h | 2 +- src/feature/dirauth/process_descs.c | 8 +++++--- src/feature/dirauth/process_descs.h | 11 ++++++----- src/feature/relay/relay_config.c | 7 ++++--- 7 files changed, 48 insertions(+), 18 deletions(-) diff --git a/changes/bug33674 b/changes/bug33674 new file mode 100644 index 000000000..bcc3fcab0 --- /dev/null +++ b/changes/bug33674 @@ -0,0 +1,4 @@ + o Minor bugfixes (--disable-module-relay,--disable-module-dirauth): + - Set some output arguments in the relay and dirauth module stubs, to + guard against future stub argument handling bugs like 33668. + Fixes bug 33674; bugfix on 0.4.3.1-alpha. diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index ede1207a8..9042ff877 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -75,8 +75,14 @@ options_validate_dirauth_mode(const struct or_options_t *old_options, #define options_act_dirauth_mtbf(old_options) \ (((void)(old_options)),0) -#define options_act_dirauth_stats(old_options, print_notice_out) \ - (((void)(old_options)),((void)(print_notice_out)),0) +static inline int +options_act_dirauth_stats(const struct or_options_t *old_options, + bool *print_notice_out) +{ + (void)old_options; + *print_notice_out = 0; + return 0; +} #define dirauth_should_reject_requests_under_load() (false) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 9490867e8..e230815ca 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -2527,9 +2527,12 @@ compute_consensus_package_lines(smartlist_t *votes) * any new signatures in src_voter_list that should be added to * target. (A signature should be added if we have no signature for that * voter in target yet, or if we have no verifiable signature and the - * new signature is verifiable.) Return the number of signatures added or - * changed, or -1 if the document signed by sigs isn't the same - * document as target. */ + * new signature is verifiable.) + * + * Return the number of signatures added or changed, or -1 if the document + * signatures are invalid. Sets *msg_out to a string constant + * describing the signature status. + */ STATIC int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, @@ -3564,6 +3567,14 @@ dirvote_add_signatures_to_pending_consensus( return r; } +/** Helper: we just got the detached_signatures_body sent to us as + * signatures on the currently pending consensus. Add them to the pending + * consensus (if we have one). + * + * Set *msg to a string constant describing the status, regardless of + * success or failure. + * + * Return negative on failure, nonnegative on success. */ static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, @@ -3626,7 +3637,12 @@ dirvote_add_signatures_to_all_pending_consensuses( /** Helper: we just got the detached_signatures_body sent to us as * signatures on the currently pending consensus. Add them to the pending * consensus (if we have one); otherwise queue them until we have a - * consensus. Return negative on failure, nonnegative on success. */ + * consensus. + * + * Set *msg to a string constant describing the status, regardless of + * success or failure. + * + * Return negative on failure, nonnegative on success. */ int dirvote_add_signatures(const char *detached_signatures_body, const char *source, diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index f695e93ab..675f4ee14 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -162,7 +162,7 @@ dirvote_add_signatures(const char *detached_signatures_body, { (void) detached_signatures_body; (void) source; - (void) msg_out; + *msg_out = "No directory authority support"; /* If the dirauth module is disabled, this should NEVER be called else we * failed to safeguard the dirauth module. */ tor_assert_nonfatal_unreached(); diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 5c918ca0b..5025d0ae3 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -285,7 +285,7 @@ dirserv_load_fingerprint_file(void) * Return the appropriate router status. * * If the status is 'RTR_REJECT' and msg is provided, set - * *msg to an explanation of why. */ + * *msg to a string constant explaining why. */ uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity) @@ -563,7 +563,8 @@ dirserv_router_has_valid_address(routerinfo_t *ri) /** Check whether we, as a directory server, want to accept ri. If so, * set its is_valid,running fields and return 0. Otherwise, return -1. * - * If the router is rejected, set *msg to an explanation of why. + * If the router is rejected, set *msg to a string constant explining + * why. * * If complain then explain at log-level 'notice' why we refused * a descriptor; else explain at log-level 'info'. @@ -729,7 +730,8 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, * That means the caller must not access ri after this function * returns, since it might have been freed. * - * Return the status of the operation. + * Return the status of the operation, and set *msg to a string + * constant describing the status. * * This function is only called when fresh descriptors are posted, not when * we re-load the cache. diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 9c1369277..1461ab697 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -98,7 +98,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, (void)desclen; (void)purpose; (void)source; - (void)msg; + *msg = "No directory authority support"; return (enum was_router_added_t)0; } static inline enum was_router_added_t @@ -107,8 +107,8 @@ dirserv_add_descriptor(routerinfo_t *ri, const char *source) { (void)ri; - (void)msg; (void)source; + *msg = "No directory authority support"; return (enum was_router_added_t)0; } static inline int @@ -125,9 +125,9 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, int *valid_out) { (void)ri; - (void)msg; (void)complain; - (void)valid_out; + *msg = "No directory authority support"; + *valid_out = 0; return 0; } static inline int @@ -143,8 +143,9 @@ dirserv_router_get_status(const routerinfo_t *router, int severity) { (void)router; - (void)msg; (void)severity; + if (msg) + *msg = "No directory authority support"; return 0; } static inline void diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index c8b40ae05..3e9961f47 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -231,8 +231,8 @@ check_server_ports(const smartlist_t *ports, } /** Parse all relay ports from options. On success, add parsed ports to - * ports, and return 0. On failure, set *msg to a description - * of the problem and return -1. + * ports, and return 0. On failure, set *msg to a newly + * allocated string describing the problem, and return -1. **/ int port_parse_ports_relay(or_options_t *options, @@ -334,7 +334,8 @@ port_update_port_set_relay(or_options_t *options, * Legacy validation function, which checks that the current OS is usable in * relay mode, if options is set to a relay mode. * - * Warns about OSes with potential issues. Always returns 0. + * Warns about OSes with potential issues. Does not set *msg. + * Always returns 0. */ int options_validate_relay_os(const or_options_t *old_options,

1 0

[tor/master] Set *have_low_ports_out from stub port_parse_ports_relay().
by nickm＠torproject.org 20 Mar '20

20 Mar '20

commit c478dc9b2f6c320cc21a10ffed0d7cc245fa933c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 20:04:53 2020 -0400 Set *have_low_ports_out from stub port_parse_ports_relay(). Previously we just ignored this option, which would leave it unset, and cause an assertion failure later on when running with the User option. Fixes bug 33668; bugfix on 0.4.3.1-alpha. --- changes/bug33668 | 4 ++++ src/feature/relay/relay_config.h | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug33668 b/changes/bug33668 new file mode 100644 index 000000000..2b0830d6d --- /dev/null +++ b/changes/bug33668 @@ -0,0 +1,4 @@ + o Minor bugfixes (--disable-module-relay): + - Fix an assertion failure when Tor is build without the relay module, + and then invoked with the "User" option. Fixes bug 33668; bugfix on + 0.4.3.1-alpha. diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h index 7a05561c2..c70c322d8 100644 --- a/src/feature/relay/relay_config.h +++ b/src/feature/relay/relay_config.h @@ -125,6 +125,20 @@ options_validate_relay_mode(const struct or_options_t *old_options, return 0; } +static inline int +port_parse_ports_relay(or_options_t *options, + char **msg, + smartlist_t *ports_out, + int *have_low_ports_out) +{ + (void)options; + (void)msg; + (void)ports_out; + if (*have_low_ports_out < 0) + *have_low_ports_out = 0; + return 0; +} + #define relay_get_dirportfrontpage() \ (NULL) #define relay_config_free_all() \ @@ -138,9 +152,6 @@ options_validate_relay_mode(const struct or_options_t *old_options, #define port_warn_nonlocal_ext_orports(ports, portname) \ (((void)(ports)),((void)(portname))) -#define port_parse_ports_relay(options, msg, ports_out, have_low_ports_out) \ - (((void)(options)),((void)(msg)),((void)(ports_out)), \ - ((void)(have_low_ports_out)),0) #define port_update_port_set_relay(options, ports) \ (((void)(options)),((void)(ports)))

1 0

[tor/maint-0.4.3] Set *have_low_ports_out from stub port_parse_ports_relay().
by nickm＠torproject.org 20 Mar '20

20 Mar '20

commit c478dc9b2f6c320cc21a10ffed0d7cc245fa933c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 20:04:53 2020 -0400 Set *have_low_ports_out from stub port_parse_ports_relay(). Previously we just ignored this option, which would leave it unset, and cause an assertion failure later on when running with the User option. Fixes bug 33668; bugfix on 0.4.3.1-alpha. --- changes/bug33668 | 4 ++++ src/feature/relay/relay_config.h | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug33668 b/changes/bug33668 new file mode 100644 index 000000000..2b0830d6d --- /dev/null +++ b/changes/bug33668 @@ -0,0 +1,4 @@ + o Minor bugfixes (--disable-module-relay): + - Fix an assertion failure when Tor is build without the relay module, + and then invoked with the "User" option. Fixes bug 33668; bugfix on + 0.4.3.1-alpha. diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h index 7a05561c2..c70c322d8 100644 --- a/src/feature/relay/relay_config.h +++ b/src/feature/relay/relay_config.h @@ -125,6 +125,20 @@ options_validate_relay_mode(const struct or_options_t *old_options, return 0; } +static inline int +port_parse_ports_relay(or_options_t *options, + char **msg, + smartlist_t *ports_out, + int *have_low_ports_out) +{ + (void)options; + (void)msg; + (void)ports_out; + if (*have_low_ports_out < 0) + *have_low_ports_out = 0; + return 0; +} + #define relay_get_dirportfrontpage() \ (NULL) #define relay_config_free_all() \ @@ -138,9 +152,6 @@ options_validate_relay_mode(const struct or_options_t *old_options, #define port_warn_nonlocal_ext_orports(ports, portname) \ (((void)(ports)),((void)(portname))) -#define port_parse_ports_relay(options, msg, ports_out, have_low_ports_out) \ - (((void)(options)),((void)(msg)),((void)(ports_out)), \ - ((void)(have_low_ports_out)),0) #define port_update_port_set_relay(options, ports) \ (((void)(options)),((void)(ports)))

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 20 Mar '20

20 Mar '20

commit b2d26fa93dde50f6e3a6bac2e713e29b40f4b8ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 20 09:46:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+he.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po index 257b97b79f..ec9ca2a1d7 100644 --- a/code_of_conduct+he.po +++ b/code_of_conduct+he.po @@ -6,7 +6,7 @@ # # Translators: # ido vasserman <itaizand(a)gmail.com>, 2019 -# ION, 2019 +# ION, 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: ION, 2019\n" +"Last-Translator: ION, 2020\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,7 +83,9 @@ msgstr "" msgid "" "0. Summary: Don't be a jerk. Be awesome instead.\n" "============================================================\n" -msgstr "0. לסיכום: אל תהיה מניאק. תהיה מדהים.\n" +msgstr "" +"0. סיכום: אל תהיה מטומטם. תהיה מדהים במקום.\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:29 @@ -212,7 +214,7 @@ msgid "" "2. Be your best self\n" "============================================================\n" msgstr "" -"2. תהיו האידיאלית שלכם/ן\n" +"2. הייה הכי טוב של עצמך\n" "============================================================\n" #. type: Plain text @@ -703,7 +705,7 @@ msgid "" "10. License and attribution\n" "============================================================\n" msgstr "" -"10. רישיון\n" +"10. רישיון וייחוס\n" "============================================================\n" #. type: Plain text

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 20 Mar '20

20 Mar '20

commit 824b72e4812afb9e428630a56643dd286ae757bd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 20 09:45:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- he/LC_MESSAGES/bridgedb.po | 119 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 93 insertions(+), 26 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index e2cdc0a3f4..7240d87c4a 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -18,8 +18,8 @@ msgid "" 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: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-06 22:46+0000\n" +"POT-Creation-Date: 2020-03-18 09:23-0700\n" +"PO-Revision-Date: 2020-03-20 09:19+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -48,18 +48,16 @@ msgstr "" #. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." +#. Convert all key/value pairs from bytes to str. #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr "סליחה! משהו השתבש בבקשה שלך." @@ -67,15 +65,15 @@ msgstr "סליחה! משהו השתבש בבקשה שלך." msgid "Language" msgstr "שפה" -#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr "דווח על תקל" -#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr "קוד מקור" -#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr "יומן שינויים" @@ -230,7 +228,7 @@ msgstr "היי, %s!" msgid "Hello, friend!" msgstr "שלום, חבר!" -#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58 msgid "Public Keys" msgstr "מפתחות ציבוריים" @@ -280,7 +278,7 @@ msgid "" "\n" msgstr "בנוסף, ל־BridgeDB יש שפע של גשרים מהסוג הישן והטוב %s ללא תעבורות נתיקות כלשהן %s, מה שאולי לא נשמע מגניב, אך הם עדין יכולים לעזור לעקוף צנזורת אינטרנט במקרים רבים.\n" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "מהם גשרים?" @@ -325,32 +323,101 @@ msgid "Get Bridges!" msgstr "השג גשרים!" #: bridgedb/strings.py:130 +msgid "Bridge distribution mechanisms" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:132 +#, python-format +msgid "" +"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n" +"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n" +"the pseudo-mechanism \"None\". The following list briefly explains how these\n" +"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" +"mechanisms is." +msgstr "" + +#: bridgedb/strings.py:138 +#, python-format +msgid "" +"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" +"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" +"solve the subsequent CAPTCHA." +msgstr "" + +#: bridgedb/strings.py:142 +#, python-format +msgid "" +"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n" +"request bridges from inside their Tor Browser settings. To get bridges, go to\n" +"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" +"subsequent CAPTCHA, and Tor Browser will automatically add your new\n" +"bridges." +msgstr "" + +#: bridgedb/strings.py:148 +#, python-format +msgid "" +"Users can request bridges from the \"Email\" distribution mechanism by sending an\n" +"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" +"email body." +msgstr "" + +#: bridgedb/strings.py:152 +msgid "Reserved" +msgstr "" + +#: bridgedb/strings.py:153 +#, python-format +msgid "" +"BridgeDB maintains a small number of bridges that are not distributed\n" +"automatically. Instead, we reserve these bridges for manual distribution and\n" +"hand them out to NGOs and other organizations and individuals that need\n" +"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" +"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" +"called \"Unallocated\" in %sbridge pool assignment%s files." +msgstr "" + +#: bridgedb/strings.py:160 +msgid "None" +msgstr "" + +#: bridgedb/strings.py:161 +msgid "" +"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n" +"It is the bridge operator's responsibility to distribute their bridges to\n" +"users. Note that on Relay Search, a freshly set up bridge's distribution\n" +"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" +"it will then change to the bridge's actual distribution mechanism.\n" +msgstr "" + +#: bridgedb/strings.py:171 msgid "Please select options for bridge type:" msgstr "אנא בחר אפשרויות לסוג הגשר:" -#: bridgedb/strings.py:131 +#: bridgedb/strings.py:172 msgid "Do you need IPv6 addresses?" msgstr "האם אתה צריך כתובות IPv6?" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:173 #, python-format msgid "Do you need a %s?" msgstr "האם אתה צריך %s?" -#: bridgedb/strings.py:136 +#: bridgedb/strings.py:177 msgid "Your browser is not displaying images properly." msgstr "הדפדפן שלך לא מציג תמונות כראוי." -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:178 msgid "Enter the characters from the image above..." msgstr "הכנס את התווים מהתמונה למעלה…" -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:182 msgid "How to start using your bridges" msgstr "איך להתחיל להשתמש בגשרים שלך" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:184 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -359,21 +426,21 @@ msgid "" msgstr "כדי להכניס גשרים לתוך דפדפן Tor, ראשית לך אל %s דף הורדת דפדפן Tor %s ולאחר מכן עקוב אחר ההוראות עבור הורדה והתחלה של דפדפן Tor." #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:189 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "כאשר הדו־שיח 'הגדרות רשת Tor' יצוץ, לחץ על 'הגדר' ועקוב אחר האשף עד שהוא ישאל:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:193 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "האם ספק שירותי האינטרנט שלך חוסם או מצנזר חיבורים אל רשת Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:156 +#: bridgedb/strings.py:197 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -381,28 +448,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "בחר 'כן' ואז לחץ על 'הבא'. כדי לתצר את הגשרים החדשים שלך, העתק והדבק את שורות הגשרים לתוך תיבת הקלט של המלל. לבסוף, לחץ על 'התחבר' ואתה אמור להיות מוכן! אם תחווה תקלה, נסה ללחוץ על הכפתור 'עזרה' באשף 'הגדרות רשת Tor' לסיוע נוסף." -#: bridgedb/strings.py:164 +#: bridgedb/strings.py:205 msgid "Displays this message." msgstr "מציג הודעה זו." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:168 +#: bridgedb/strings.py:209 msgid "Request vanilla bridges." msgstr "בקש גשרים מהסוג הישן." -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:210 msgid "Request IPv6 bridges." msgstr "בקש גשרי IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:212 msgid "Request a Pluggable Transport by TYPE." msgstr "בקש תעבורה נתיקה לפי TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:215 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "קבל עותק של מפתח ה־GPG הציבורי של BridgeDB."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 20 Mar '20

20 Mar '20

commit 394190a9c417b23db6ac67693eb2d3d9c9485770 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 20 09:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- he/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 8cd9943a4d..71c3a88916 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,7 +19,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: 2020-03-18 09:23-0700\n" -"PO-Revision-Date: 2020-03-20 09:12+0000\n" +"PO-Revision-Date: 2020-03-20 09:19+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -376,7 +376,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "BridgeDB מתחזק מספר קטן של גשרים שאינם מופצים\nבאופן אוטומטי. במקום זאת, אנחנו שומרים גשרים אלו עבור הפצה ידנית\nומחלקים אותם אל ארגונים בלתי־ממשלתיים וארגונים אחרים ויחידניים שצריכים\nגשרים. גשרים שמוצפים על גבי מנגנון \"שמור\" עשויים שלא\nלראות משתמשים במשך זמן רב. שים לב שמנגנון ההפצה \"שמור\" הוא\nנקרא \"בלתי־מוקצב\" בקבצי %sמטלת בריכה של גשר%s." +msgstr "BridgeDB מתחזק מספר קטן של גשרים שאינם מופצים\nבאופן אוטומטי. במקום זאת, אנחנו שומרים גשרים אלו עבור הפצה ידנית\nומחלקים אותם אל ארגונים בלתי־ממשלתיים וארגונים אחרים ויחידניים שצריכים\nגשרים. גשרים שמוצפים על גבי מנגנון \"שָׁמוּר\" עשויים שלא\nלראות משתמשים במשך זמן רב. שים לב שמנגנון ההפצה \"שָׁמוּר\" הוא\nנקרא \"בלתי־מוקצב\" בקבצי %sמטלת בריכה של גשר%s." #: bridgedb/strings.py:160 msgid "None" @@ -389,7 +389,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "גשרים אשר מנגנון ההפצה שלהם הוא \"כלום\" אינם מופצים ע״י BridgeDB.\nזאת אחריות של מתפעל הגשר להפיץ את הגשרים שלו למשתמשים.\nשים לב שבחיפוש ממסר, מנגנון הפצה טרי שהוגדר של גשר\nאומר \"כלום\" עד יום אחד בקירוב. אנא הייה סבלני, ואז זה ישתנה\nאל מנגנון ההפצה הממשי של הגשר.\n" #: bridgedb/strings.py:171 msgid "Please select options for bridge type:"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 20 Mar '20

20 Mar '20

commit 961479da13309008840eb1c97a362ff643a806fe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 20 09:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- he/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index e6e73724a8..8cd9943a4d 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,7 +19,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: 2020-03-18 09:23-0700\n" -"PO-Revision-Date: 2020-03-20 08:43+0000\n" +"PO-Revision-Date: 2020-03-20 09:12+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -343,7 +343,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "מנגנון ההפצה \"HTTPS\" מחלק גשרים על גבי אתר זה. כדי לקבל\nגשרים, לך אל %sbridges.torproject.org%s, בחר את האפשרויות המועדפות עליך,\nופתור CAPTCHA שלאחר מכן." #: bridgedb/strings.py:142 #, python-format @@ -353,7 +353,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "מנגנון ההפצה \"Moat\" הוא חלק מדפדפן Tor, מה שמתיר למשתמשים\nלבקש גשרים מתוך הגדרות דפדפן Tor. כדי לקבל גשרים, לך אל\n%sהגדרות Tor%s של דפדפן Tor שלך, לחץ על \"בקש גשר חדש\", פתור\nCAPTCHA שלאחר מכן, ודפדפן Tor יוסיף באופן אוטומטי את הגשרים\nהחדשים שלך." #: bridgedb/strings.py:148 #, python-format @@ -361,7 +361,7 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "" +msgstr "משתמשים יכולים לבקש גשרים ממנגנון ההפצה \"דוא״ל\" על ידי שליחת\nדוא״ל אל %sbridges(a)torproject.org%s וכתיבת \"get transport obfs4\" בגוף הדוא״ל." #: bridgedb/strings.py:152 msgid "Reserved" @@ -376,7 +376,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "BridgeDB מתחזק מספר קטן של גשרים שאינם מופצים\nבאופן אוטומטי. במקום זאת, אנחנו שומרים גשרים אלו עבור הפצה ידנית\nומחלקים אותם אל ארגונים בלתי־ממשלתיים וארגונים אחרים ויחידניים שצריכים\nגשרים. גשרים שמוצפים על גבי מנגנון \"שמור\" עשויים שלא\nלראות משתמשים במשך זמן רב. שים לב שמנגנון ההפצה \"שמור\" הוא\nנקרא \"בלתי־מוקצב\" בקבצי %sמטלת בריכה של גשר%s." #: bridgedb/strings.py:160 msgid "None"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 20 Mar '20

20 Mar '20

commit 92989c00d123fafa03e2f8aa20da6df5e2e411ff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 20 08:45:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- he/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index c52c935527..e6e73724a8 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,7 +19,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: 2020-03-18 09:23-0700\n" -"PO-Revision-Date: 2020-03-19 07:14+0000\n" +"PO-Revision-Date: 2020-03-20 08:43+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -324,7 +324,7 @@ msgstr "השג גשרים!" #: bridgedb/strings.py:130 msgid "Bridge distribution mechanisms" -msgstr "" +msgstr "מנגנוני הפצת גשרים" #. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". #: bridgedb/strings.py:132 @@ -335,7 +335,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "" +msgstr "BridgeDB מיישם ארבעה מנגנונים להפצת גשרים: \"HTTPS\", \"Moat\",\n\"דוא״ל\", ו\"שָׁמוּר\". גשרים שאינם מופצים על גבי BridgeDB משתמשים במנגנון המדומה \"כלום\". הרשימה הבאה מסבירה בקצרה כיצד מנגנונים אלו עובדים ו%sמדדי BridgeDB%s שלנו ממחיזים כמה פופולרי כל אחד מהמנגנונים." #: bridgedb/strings.py:138 #, python-format @@ -365,7 +365,7 @@ msgstr "" #: bridgedb/strings.py:152 msgid "Reserved" -msgstr "" +msgstr "שָׁמוּר" #: bridgedb/strings.py:153 #, python-format

1 0