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

[tor/master] Merge remote-tracking branch 'ahf/bugs/21654'
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 85782e111a41fa432df58e40b57ec55710a914e1 Merge: a9b046c 02fc0a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 9 08:36:46 2017 -0500 Merge remote-tracking branch 'ahf/bugs/21654' changes/bug20988 | 4 -- changes/bug21654 | 4 ++ src/common/compat.c | 39 ------------- src/common/compat.h | 2 - src/common/util.c | 146 +++++++++++++++++----------------------------- src/common/util.h | 11 ++-- src/or/dirserv.c | 4 +- src/or/geoip.c | 2 +- src/test/test_pt.c | 6 +- src/test/test_util.c | 132 +++++++++++++++++++++-------------------- src/test/test_util_slow.c | 4 +- 11 files changed, 138 insertions(+), 216 deletions(-)

1 0

[tor/master] Remove fgets() compatbility function and related tests.
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 02fc0a5ecfc917e9261596816e926468db976453 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 8 23:11:42 2017 +0100 Remove fgets() compatbility function and related tests. This patch removes the `tor_fgets()` wrapper around `fgets(3)` since it is no longer needed. The function was created due to inconsistency between the returned values of `fgets(3)` on different versions of Unix when using `fgets(3)` on non-blocking file descriptors, but with the recent changes in bug #21654 we switch from unbuffered to direct I/O on non-blocking file descriptors in our utility module. We continue to use `fgets(3)` directly in the geoip and dirserv module since this usage is considered safe. This patch also removes the test-case that was created to detect differences in the implementation of `fgets(3)` as well as the changes file since these changes was not included in any releases yet. See: https://bugs.torproject.org/21654 --- changes/bug20988 | 4 -- src/common/compat.c | 39 ------------------ src/common/compat.h | 2 - src/or/dirserv.c | 4 +- src/or/geoip.c | 2 +- src/test/test_util.c | 111 --------------------------------------------------- 6 files changed, 3 insertions(+), 159 deletions(-) diff --git a/changes/bug20988 b/changes/bug20988 deleted file mode 100644 index b1d73f0..0000000 --- a/changes/bug20988 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (portability): - - Add Tor compatibility function for fgets(3) due to inconsistency of - returned values in different supported C libraries. This fixes unit test - failures reported on FreeBSD. Fixes bug 20988. diff --git a/src/common/compat.c b/src/common/compat.c index da4283f..0dbede6 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3476,45 +3476,6 @@ tor_getpass(const char *prompt, char *output, size_t buflen) #endif } -/** Read at most one less than the number of characters specified by - * size from the given stream and store it in str. - * - * Reading stops when a newline character is found or at EOF or error. If any - * characters are read and there's no error, a trailing NUL byte is appended to - * the end of str. - * - * Upon successful completion, this function returns a pointer to the string - * str. If EOF occurs before any characters are read the function will - * return NULL and the content of str is unchanged. Upon error, the - * function returns NULL and the caller must check for error using foef(3) and - * ferror(3). - */ -char * -tor_fgets(char *str, int size, FILE *stream) -{ - char *ret; - - /* Reset errno before our call to fgets(3) to avoid a situation where the - * caller is calling us again because we just returned NULL and errno == - * EAGAIN, but when they call us again we will always return NULL because the - * error flag on the file handler remains set and errno is set to EAGAIN. - */ - errno = 0; - - ret = fgets(str, size, stream); - - /* FreeBSD, OpenBSD, Linux (glibc), and Linux (musl) seem to disagree about - * what to do in the given situation. We check if the stream has been flagged - * with an error-bit and return NULL in that situation if errno is also set - * to EAGAIN. - */ - if (ferror(stream) && errno == EAGAIN) { - return NULL; - } - - return ret; -} - /** Return the amount of free disk space we have permission to use, in * bytes. Return -1 if the amount of free space can't be determined. */ int64_t diff --git a/src/common/compat.h b/src/common/compat.h index 1f51ece..ee1c945 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -740,8 +740,6 @@ STATIC int tor_ersatz_socketpair(int family, int type, int protocol, ssize_t tor_getpass(const char *prompt, char *output, size_t buflen); -char *tor_fgets(char *str, int size, FILE *stream); - /* This needs some of the declarations above so we include it here. */ #include "compat_threads.h" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 2c3ce10..f01668a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2701,7 +2701,7 @@ dirserv_read_measured_bandwidths(const char *from_file, return -1; } - if (!tor_fgets(line, sizeof(line), fp) + if (!fgets(line, sizeof(line), fp) || !strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); @@ -2731,7 +2731,7 @@ dirserv_read_measured_bandwidths(const char *from_file, while (!feof(fp)) { measured_bw_line_t parsed_line; - if (tor_fgets(line, sizeof(line), fp) && strlen(line)) { + if (fgets(line, sizeof(line), fp) && strlen(line)) { if (measured_bw_line_parse(&parsed_line, line) != -1) { /* Also cache the line for dirserv_get_bandwidth_for_router() */ dirserv_cache_measured_bw(&parsed_line, file_time); diff --git a/src/or/geoip.c b/src/or/geoip.c index a8dc807..74811ea 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -346,7 +346,7 @@ geoip_load_file(sa_family_t family, const char *filename) (family == AF_INET) ? "IPv4" : "IPv6", filename); while (!feof(f)) { char buf[512]; - if (tor_fgets(buf, (int)sizeof(buf), f) == NULL) + if (fgets(buf, (int)sizeof(buf), f) == NULL) break; crypto_digest_add_bytes(geoip_digest_env, buf, strlen(buf)); /* FFFF track full country name. */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 640935a..130a019 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3940,116 +3940,6 @@ test_util_exit_status(void *ptr) #endif #ifndef _WIN32 -/* Check that fgets with a non-blocking pipe returns partial lines and sets - * EAGAIN, returns full lines and sets no error, and returns NULL on EOF and - * sets no error */ -static void -test_util_fgets_eagain(void *ptr) -{ - int test_pipe[2] = {-1, -1}; - int retval; - ssize_t retlen; - char *retptr; - FILE *test_stream = NULL; - char buf[4] = { 0 }; - - (void)ptr; - - errno = 0; - - /* Set up a pipe to test on */ - retval = pipe(test_pipe); - tt_int_op(retval, OP_EQ, 0); - - /* Set up the read-end to be non-blocking */ - retval = fcntl(test_pipe[0], F_SETFL, O_NONBLOCK); - tt_int_op(retval, OP_EQ, 0); - - /* Open it as a stdio stream */ - test_stream = fdopen(test_pipe[0], "r"); - tt_ptr_op(test_stream, OP_NE, NULL); - - /* Send in a partial line */ - retlen = write(test_pipe[1], "A", 1); - tt_int_op(retlen, OP_EQ, 1); - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, EAGAIN); - tt_ptr_op(retptr, OP_EQ, NULL); - tt_str_op(buf, OP_EQ, "A"); - errno = 0; - - /* Send in the rest */ - retlen = write(test_pipe[1], "B\n", 2); - tt_int_op(retlen, OP_EQ, 2); - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, 0); - tt_ptr_op(retptr, OP_EQ, buf); - tt_str_op(buf, OP_EQ, "B\n"); - errno = 0; - memset(buf, '\0', sizeof(buf)); - - /* Send in a full line */ - retlen = write(test_pipe[1], "CD\n", 3); - tt_int_op(retlen, OP_EQ, 3); - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, 0); - tt_ptr_op(retptr, OP_EQ, buf); - tt_str_op(buf, OP_EQ, "CD\n"); - errno = 0; - memset(buf, '\0', sizeof(buf)); - - /* Send in a partial line */ - retlen = write(test_pipe[1], "E", 1); - tt_int_op(retlen, OP_EQ, 1); - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, EAGAIN); - tt_ptr_op(retptr, OP_EQ, NULL); - tt_str_op(buf, OP_EQ, "E"); - errno = 0; - - /* Send in the rest */ - retlen = write(test_pipe[1], "F\n", 2); - tt_int_op(retlen, OP_EQ, 2); - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, 0); - tt_ptr_op(retptr, OP_EQ, buf); - tt_str_op(buf, OP_EQ, "F\n"); - errno = 0; - memset(buf, '\0', sizeof(buf)); - - /* Send in a full line and close */ - retlen = write(test_pipe[1], "GH", 2); - tt_int_op(retlen, OP_EQ, 2); - retval = close(test_pipe[1]); - tt_int_op(retval, OP_EQ, 0); - test_pipe[1] = -1; - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, 0); - tt_ptr_op(retptr, OP_EQ, buf); - tt_str_op(buf, OP_EQ, "GH"); - errno = 0; - - /* Check for EOF */ - retptr = tor_fgets(buf, sizeof(buf), test_stream); - tt_int_op(errno, OP_EQ, 0); - tt_ptr_op(retptr, OP_EQ, NULL); - retval = feof(test_stream); - tt_int_op(retval, OP_NE, 0); - errno = 0; - - /* Check that buf is unchanged according to C99 and C11 */ - tt_str_op(buf, OP_EQ, "GH"); - memset(buf, '\0', sizeof(buf)); - - done: - if (test_stream != NULL) - fclose(test_stream); - if (test_pipe[0] != -1) - close(test_pipe[0]); - if (test_pipe[1] != -1) - close(test_pipe[1]); -} - static void test_util_string_from_pipe(void *ptr) { @@ -5839,7 +5729,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(num_cpus, 0), UTIL_TEST_WIN_ONLY(load_win_lib, 0), UTIL_TEST_NO_WIN(exit_status, 0), - UTIL_TEST_NO_WIN(fgets_eagain, 0), UTIL_TEST_NO_WIN(string_from_pipe, 0), UTIL_TEST(format_hex_number, 0), UTIL_TEST(format_dec_number, 0),

1 0

[tor/master] Add test case for get_string_from_pipe().
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 0e5c7dc45b9a70ba44dd9a3dc0c3cb38e05e019d Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 8 18:08:02 2017 +0100 Add test case for get_string_from_pipe(). This patch adds a test case for the get_string_from_pipe() function found in the utility module. See: See: https://bugs.torproject.org/21654 --- src/test/test_util.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 3e4d45d..640935a 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4049,7 +4049,123 @@ test_util_fgets_eagain(void *ptr) if (test_pipe[1] != -1) close(test_pipe[1]); } -#endif + +static void +test_util_string_from_pipe(void *ptr) +{ + int test_pipe[2] = {-1, -1}; + int retval = 0; + enum stream_status status = IO_STREAM_TERM; + ssize_t retlen; + char buf[4] = { 0 }; + + (void)ptr; + + errno = 0; + + /* Set up a pipe to test on */ + retval = pipe(test_pipe); + tt_int_op(retval, OP_EQ, 0); + + /* Send in a string. */ + retlen = write(test_pipe[1], "ABC", 3); + tt_int_op(retlen, OP_EQ, 3); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "ABC"); + errno = 0; + + /* Send in a string that contains a nul. */ + retlen = write(test_pipe[1], "AB\0", 3); + tt_int_op(retlen, OP_EQ, 3); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "AB"); + errno = 0; + + /* Send in a string that contains a nul only. */ + retlen = write(test_pipe[1], "\0", 1); + tt_int_op(retlen, OP_EQ, 1); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, ""); + errno = 0; + + /* Send in a string that contains a trailing newline. */ + retlen = write(test_pipe[1], "AB\n", 3); + tt_int_op(retlen, OP_EQ, 3); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "AB"); + errno = 0; + + /* Send in a string that contains a newline only. */ + retlen = write(test_pipe[1], "\n", 1); + tt_int_op(retlen, OP_EQ, 1); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, ""); + errno = 0; + + /* Send in a string and check that we nul terminate return values. */ + retlen = write(test_pipe[1], "AAA", 3); + tt_int_op(retlen, OP_EQ, 3); + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "AAA"); + tt_mem_op(buf, OP_EQ, "AAA\0", sizeof(buf)); + errno = 0; + + retlen = write(test_pipe[1], "B", 1); + tt_int_op(retlen, OP_EQ, 1); + + memset(buf, '\xff', sizeof(buf)); + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "B"); + tt_mem_op(buf, OP_EQ, "B\0\xff\xff", sizeof(buf)); + errno = 0; + + /* Send in a line and close */ + retlen = write(test_pipe[1], "AB", 2); + tt_int_op(retlen, OP_EQ, 2); + retval = close(test_pipe[1]); + tt_int_op(retval, OP_EQ, 0); + test_pipe[1] = -1; + + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_OKAY); + tt_str_op(buf, OP_EQ, "AB"); + errno = 0; + + /* Check for EOF */ + status = get_string_from_pipe(test_pipe[0], buf, sizeof(buf)-1); + tt_int_op(errno, OP_EQ, 0); + tt_int_op(status, OP_EQ, IO_STREAM_CLOSED); + errno = 0; + + done: + if (test_pipe[0] != -1) + close(test_pipe[0]); + if (test_pipe[1] != -1) + close(test_pipe[1]); +} + +#endif // _WIN32 /** * Test for format_hex_number_sigsafe() @@ -5724,6 +5840,7 @@ struct testcase_t util_tests[] = { UTIL_TEST_WIN_ONLY(load_win_lib, 0), UTIL_TEST_NO_WIN(exit_status, 0), UTIL_TEST_NO_WIN(fgets_eagain, 0), + UTIL_TEST_NO_WIN(string_from_pipe, 0), UTIL_TEST(format_hex_number, 0), UTIL_TEST(format_dec_number, 0), UTIL_TEST(join_win_cmdline, 0),

1 0

[tor/master] Use read(2) instead of fgets(3) when reading process output.
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 86de065aee642585e092969c69681f7e8847a648 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 8 00:12:06 2017 +0100 Use read(2) instead of fgets(3) when reading process output. This patch modifies `tor_read_all_handle()` to use read(2) instead of fgets(3) when reading the stdout from the child process. This should eliminate the race condition that can be triggered in the 'slow/util/*' tests on slower machines running OpenBSD, FreeBSD and HardenedBSD. See: https://bugs.torproject.org/21654 --- src/common/util.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index a69d887..e2ad5ff 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5010,7 +5010,7 @@ tor_read_all_handle(FILE *h, char *buf, size_t count, int *eof) { size_t numread = 0; - char *retval; + ssize_t result; if (eof) *eof = 0; @@ -5019,33 +5019,27 @@ tor_read_all_handle(FILE *h, char *buf, size_t count, return -1; while (numread != count) { - /* Use fgets because that is what we use in log_from_pipe() */ - retval = tor_fgets(buf+numread, (int)(count-numread), h); - if (NULL == retval) { - if (feof(h)) { - log_debug(LD_GENERAL, "fgets() reached end of file"); - if (eof) - *eof = 1; + result = read(fileno(h), buf+numread, count-numread); + + if (result == 0) { + log_debug(LD_GENERAL, "read() reached end of file"); + if (eof) + *eof = 1; + break; + } else if (result < 0 && errno == EAGAIN) { + if (process) + continue; + else break; - } else { - if (EAGAIN == errno) { - if (process) - continue; - else - break; - } else { - log_warn(LD_GENERAL, "fgets() from handle failed: %s", - strerror(errno)); - return -1; - } - } + } else if (result < 0) { + log_warn(LD_GENERAL, "read() failed: %s", strerror(errno)); + return -1; } - tor_assert(retval != NULL); - tor_assert(strlen(retval) + numread <= count); - numread += strlen(retval); + + numread += result; } - log_debug(LD_GENERAL, "fgets() read %d bytes from handle", (int)numread); + log_debug(LD_GENERAL, "read() read %d bytes from handle", (int)numread); return (ssize_t)numread; } #endif

1 0

[tor/master] Use less-than instead of not-equal-to for comparison in read loops.
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 02ef06516e64c1559b24123d7c7d164b76110c9a Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 8 23:02:34 2017 +0100 Use less-than instead of not-equal-to for comparison in read loops. This patch changes a number of read loops in the util module to use less-than comparison instead of not-equal-to comparison. We do this in the case that we have a bug elsewhere that might cause `numread` to become larger than `count` and thus become an infinite loop. --- src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 1fd3b16..a8b44cb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2118,7 +2118,7 @@ read_all(tor_socket_t fd, char *buf, size_t count, int isSocket) return -1; } - while (numread != count) { + while (numread < count) { if (isSocket) result = tor_socket_recv(fd, buf+numread, count-numread, 0); else @@ -4943,7 +4943,7 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, if (count > SIZE_T_CEILING || count > SSIZE_MAX) return -1; - while (numread != count) { + while (numread < count) { /* Check if there is anything to read */ retval = PeekNamedPipe(h, NULL, 0, NULL, &byte_count, NULL); if (!retval) { @@ -5009,7 +5009,7 @@ tor_read_all_handle(int fd, char *buf, size_t count, if (count > SIZE_T_CEILING || count > SSIZE_MAX) return -1; - while (numread != count) { + while (numread < count) { result = read(fd, buf+numread, count-numread); if (result == 0) {

1 0

[tor/master] Remove buffered I/O stream usage in process_handle_t.
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 6e78ede73f190f3aaf91623a131a20cf031aad7e Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 8 01:47:12 2017 +0100 Remove buffered I/O stream usage in process_handle_t. This patch removes the buffered I/O stream usage in process_handle_t and its related utility functions. This simplifies the code and avoids racy code where we used buffered I/O on non-blocking file descriptors. See: https://bugs.torproject.org/21654 --- changes/bug21654 | 4 ++ src/common/util.c | 100 +++++++++++++++------------------------------- src/common/util.h | 11 ++--- src/test/test_pt.c | 6 +-- src/test/test_util_slow.c | 4 +- 5 files changed, 46 insertions(+), 79 deletions(-) diff --git a/changes/bug21654 b/changes/bug21654 new file mode 100644 index 0000000..fd1c650 --- /dev/null +++ b/changes/bug21654 @@ -0,0 +1,4 @@ + o Code simplifications and refactoring + - Use unbuffered I/O for utility functions around the process_handle_t + type. This fixes unit test failures reported on OpenBSD and FreeBSD. + Fixes bug 21654. diff --git a/src/common/util.c b/src/common/util.c index e2ad5ff..1fd3b16 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4175,10 +4175,10 @@ tor_process_get_stdout_pipe(process_handle_t *process_handle) } #else /* DOCDOC tor_process_get_stdout_pipe */ -FILE * +int tor_process_get_stdout_pipe(process_handle_t *process_handle) { - return process_handle->stdout_handle; + return process_handle->stdout_pipe; } #endif @@ -4609,10 +4609,6 @@ tor_spawn_background(const char *const filename, const char **argv, log_warn(LD_GENERAL, "Failed to set stderror/stdout/stdin pipes " "nonblocking in parent process: %s", strerror(errno)); } - /* Open the buffered IO streams */ - process_handle->stdout_handle = fdopen(process_handle->stdout_pipe, "r"); - process_handle->stderr_handle = fdopen(process_handle->stderr_pipe, "r"); - process_handle->stdin_handle = fdopen(process_handle->stdin_pipe, "r"); *process_handle_out = process_handle; return process_handle->status; @@ -4659,14 +4655,9 @@ tor_process_handle_destroy,(process_handle_t *process_handle, if (process_handle->stdin_pipe) CloseHandle(process_handle->stdin_pipe); #else - if (process_handle->stdout_handle) - fclose(process_handle->stdout_handle); - - if (process_handle->stderr_handle) - fclose(process_handle->stderr_handle); - - if (process_handle->stdin_handle) - fclose(process_handle->stdin_handle); + close(process_handle->stdout_pipe); + close(process_handle->stderr_pipe); + close(process_handle->stdin_pipe); clear_waitpid_callback(process_handle->waitpid_cb); #endif @@ -4998,14 +4989,14 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, return (ssize_t)numread; } #else -/** Read from a handle h into buf, up to count bytes. If +/** Read from a handle fd into buf, up to count bytes. If * process is NULL, the function will return immediately if there is * nothing more to read. Otherwise data will be read until end of file, or * count bytes are read. Returns the number of bytes read, or -1 on * error. Sets eof to true if eof is not NULL and the end of the * file has been reached. */ ssize_t -tor_read_all_handle(FILE *h, char *buf, size_t count, +tor_read_all_handle(int fd, char *buf, size_t count, const process_handle_t *process, int *eof) { @@ -5019,7 +5010,7 @@ tor_read_all_handle(FILE *h, char *buf, size_t count, return -1; while (numread != count) { - result = read(fileno(h), buf+numread, count-numread); + result = read(fd, buf+numread, count-numread); if (result == 0) { log_debug(LD_GENERAL, "read() reached end of file"); @@ -5053,7 +5044,7 @@ tor_read_all_from_process_stdout(const process_handle_t *process_handle, return tor_read_all_handle(process_handle->stdout_pipe, buf, count, process_handle); #else - return tor_read_all_handle(process_handle->stdout_handle, buf, count, + return tor_read_all_handle(process_handle->stdout_pipe, buf, count, process_handle, NULL); #endif } @@ -5067,7 +5058,7 @@ tor_read_all_from_process_stderr(const process_handle_t *process_handle, return tor_read_all_handle(process_handle->stderr_pipe, buf, count, process_handle); #else - return tor_read_all_handle(process_handle->stderr_handle, buf, count, + return tor_read_all_handle(process_handle->stderr_pipe, buf, count, process_handle, NULL); #endif } @@ -5261,11 +5252,10 @@ log_from_handle(HANDLE *pipe, int severity) #else /** Return a smartlist containing lines outputted from - * handle. Return NULL on error, and set + * fd. Return NULL on error, and set * stream_status_out appropriately. */ MOCK_IMPL(smartlist_t *, -tor_get_lines_from_handle, (FILE *handle, - enum stream_status *stream_status_out)) +tor_get_lines_from_handle, (int fd, enum stream_status *stream_status_out)) { enum stream_status stream_status; char stdout_buf[400]; @@ -5274,7 +5264,7 @@ tor_get_lines_from_handle, (FILE *handle, while (1) { memset(stdout_buf, 0, sizeof(stdout_buf)); - stream_status = get_string_from_pipe(handle, + stream_status = get_string_from_pipe(fd, stdout_buf, sizeof(stdout_buf) - 1); if (stream_status != IO_STREAM_OKAY) goto done; @@ -5288,20 +5278,20 @@ tor_get_lines_from_handle, (FILE *handle, return lines; } -/** Read from stream, and send lines to log at the specified log level. +/** Read from fd, and send lines to log at the specified log level. * Returns 1 if stream is closed normally, -1 if there is a error reading, and * 0 otherwise. Handles lines from tor-fw-helper and * tor_spawn_background() specially. */ static int -log_from_pipe(FILE *stream, int severity, const char *executable, +log_from_pipe(int fd, int severity, const char *executable, int *child_status) { char buf[256]; enum stream_status r; for (;;) { - r = get_string_from_pipe(stream, buf, sizeof(buf) - 1); + r = get_string_from_pipe(fd, buf, sizeof(buf) - 1); if (r == IO_STREAM_CLOSED) { return 1; @@ -5326,7 +5316,7 @@ log_from_pipe(FILE *stream, int severity, const char *executable, } #endif -/** Reads from stream and stores input in buf_out making +/** Reads from fd and stores input in buf_out making * sure it's below count bytes. * If the string has a trailing newline, we strip it off. * @@ -5342,52 +5332,28 @@ log_from_pipe(FILE *stream, int severity, const char *executable, * IO_STREAM_OKAY: If everything went okay and we got a string * in buf_out. */ enum stream_status -get_string_from_pipe(FILE *stream, char *buf_out, size_t count) +get_string_from_pipe(int fd, char *buf_out, size_t count) { - char *retval; - size_t len; + ssize_t ret; tor_assert(count <= INT_MAX); - retval = tor_fgets(buf_out, (int)count, stream); - - if (!retval) { - if (feof(stream)) { - /* Program has closed stream (probably it exited) */ - /* TODO: check error */ - return IO_STREAM_CLOSED; - } else { - if (EAGAIN == errno) { - /* Nothing more to read, try again next time */ - return IO_STREAM_EAGAIN; - } else { - /* There was a problem, abandon this child process */ - return IO_STREAM_TERM; - } - } - } else { - len = strlen(buf_out); - if (len == 0) { - /* this probably means we got a NUL at the start of the string. */ - return IO_STREAM_EAGAIN; - } + ret = read(fd, buf_out, count); - if (buf_out[len - 1] == '\n') { - /* Remove the trailing newline */ - buf_out[len - 1] = '\0'; - } else { - /* No newline; check whether we overflowed the buffer */ - if (!feof(stream)) - log_info(LD_GENERAL, - "Line from stream was truncated: %s", buf_out); - /* TODO: What to do with this error? */ - } + if (ret == 0) + return IO_STREAM_CLOSED; + else if (ret < 0 && errno == EAGAIN) + return IO_STREAM_EAGAIN; + else if (ret < 0) + return IO_STREAM_TERM; - return IO_STREAM_OKAY; - } + if (buf_out[ret - 1] == '\n') { + /* Remove the trailing newline */ + buf_out[ret - 1] = '\0'; + } else + buf_out[ret] = '\0'; - /* We should never get here */ - return IO_STREAM_TERM; + return IO_STREAM_OKAY; } /** Parse a line from tor-fw-helper and issue an appropriate @@ -5624,7 +5590,7 @@ tor_check_port_forwarding(const char *filename, #ifdef _WIN32 stderr_status = log_from_handle(child_handle->stderr_pipe, LOG_INFO); #else - stderr_status = log_from_pipe(child_handle->stderr_handle, + stderr_status = log_from_pipe(child_handle->stderr_pipe, LOG_INFO, filename, &retval); #endif if (handle_fw_helper_output(filename, child_handle) < 0) { diff --git a/src/common/util.h b/src/common/util.h index 13fcc51..a8d7978 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -322,7 +322,7 @@ enum stream_status { const char *stream_status_to_string(enum stream_status stream_status); -enum stream_status get_string_from_pipe(FILE *stream, char *buf, size_t count); +enum stream_status get_string_from_pipe(int fd, char *buf, size_t count); MOCK_DECL(int,tor_unlink,(const char *pathname)); @@ -463,9 +463,6 @@ struct process_handle_t { int stdin_pipe; int stdout_pipe; int stderr_pipe; - FILE *stdin_handle; - FILE *stdout_handle; - FILE *stderr_handle; pid_t pid; /** If the process has not given us a SIGCHLD yet, this has the * waitpid_callback_t that gets invoked once it has. Otherwise this @@ -488,7 +485,7 @@ int tor_split_lines(struct smartlist_t *sl, char *buf, int len); ssize_t tor_read_all_handle(HANDLE h, char *buf, size_t count, const process_handle_t *process); #else -ssize_t tor_read_all_handle(FILE *h, char *buf, size_t count, +ssize_t tor_read_all_handle(int fd, char *buf, size_t count, const process_handle_t *process, int *eof); #endif @@ -502,7 +499,7 @@ int tor_process_get_pid(process_handle_t *process_handle); #ifdef _WIN32 HANDLE tor_process_get_stdout_pipe(process_handle_t *process_handle); #else -FILE *tor_process_get_stdout_pipe(process_handle_t *process_handle); +int tor_process_get_stdout_pipe(process_handle_t *process_handle); #endif #ifdef _WIN32 @@ -511,7 +508,7 @@ tor_get_lines_from_handle,(HANDLE *handle, enum stream_status *stream_status)); #else MOCK_DECL(struct smartlist_t *, -tor_get_lines_from_handle,(FILE *handle, +tor_get_lines_from_handle,(int fd, enum stream_status *stream_status)); #endif diff --git a/src/test/test_pt.c b/src/test/test_pt.c index f93019f..f50c75a 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -284,13 +284,13 @@ test_pt_get_extrainfo_string(void *arg) } #ifdef _WIN32 -#define STDIN_HANDLE HANDLE +#define STDIN_HANDLE HANDLE* #else -#define STDIN_HANDLE FILE +#define STDIN_HANDLE int #endif static smartlist_t * -tor_get_lines_from_handle_replacement(STDIN_HANDLE *handle, +tor_get_lines_from_handle_replacement(STDIN_HANDLE handle, enum stream_status *stream_status_out) { static int times_called = 0; diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c index 1e71605..96a2fa7 100644 --- a/src/test/test_util_slow.c +++ b/src/test/test_util_slow.c @@ -242,7 +242,7 @@ test_util_spawn_background_partial_read_impl(int exit_early) #else /* Check that we didn't read the end of file last time */ tt_assert(!eof); - pos = tor_read_all_handle(process_handle->stdout_handle, stdout_buf, + pos = tor_read_all_handle(process_handle->stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, NULL, &eof); #endif log_info(LD_GENERAL, "tor_read_all_handle() returned %d", (int)pos); @@ -273,7 +273,7 @@ test_util_spawn_background_partial_read_impl(int exit_early) #else if (!eof) { /* We should have got all the data, but maybe not the EOF flag */ - pos = tor_read_all_handle(process_handle->stdout_handle, stdout_buf, + pos = tor_read_all_handle(process_handle->stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, process_handle, &eof); tt_int_op(0,OP_EQ, pos);

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Mar '17

09 Mar '17

commit af63b2b1bfdc8e2a93672c6dad28e28c25919b95 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 9 13:18:21 2017 +0000 Update translations for tor-browser-manual --- hr_HR/hr_HR.po | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- pt/pt.po | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 10 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index d65eb4d..efd0506 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -1157,16 +1157,25 @@ msgid "" " many websites from displaying correctly, so Tor Browser’s default setting " "is to allow all websites to run scripts." msgstr "" +"Korisnici koji zahtjevaju visok stupanj sigurnosti u svojim pregldnicima bi " +"trebali postaviti <link xref=\"security-slider\">Sigurnosni klizač</link> " +"Tor Browsera na \"Srednje visoko\" (što onemogućuje JavaScript za ne-HTTPS " +"stranice) ili na \"Visoko\" (što onemogućuje za sve stranice). Napomena je " +"da će onemugćavanje JavaScripta spriječiti mnoge stranice da se prikazuju " +"ispravno, tako da je zadana postavka Tor Browsera da dopusti svim stranicama" +" da koriste skripte." #: plugins.page:58 msgid "Browser Add-ons" -msgstr "" +msgstr "Dodatci za preglednik" #: plugins.page:59 msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" +"Tor Browser je zasnovan na Firefoxu, i svi dodatci i teme koji su " +"kompatibilni s Firefoxom, također mogu biti instalirani na Tor Browser." #: plugins.page:64 msgid "" @@ -1176,14 +1185,19 @@ msgid "" " privacy and security. It is strongly discouraged to install additional add-" "ons, and the Tor Project will not offer support for these configurations." msgstr "" +"No, jedini dodatci koji su testirani za korištenje sa Tor Browserom su oni " +"koji su uključeni pod zadano. Instaliranje bilo kojeg drugog dadatka može " +"smanjiti funkcionalnost Tor Browsera ili izazvati ozbiljnije probleme koji " +"utječu na Vašu privatnost i sigurnost. Snažno se odgovara od instaliranja " +"dodataka, i Tor projekt neće pružiti podršku za takve konfiguracije." #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" -msgstr "" +msgstr "Naučite kako zaštiti svoje podatke korištenjem Tor Browsera i HTTPS-a" #: secure-connections.page:12 msgid "Secure Connections" -msgstr "" +msgstr "Sigurne veze" #: secure-connections.page:14 msgid "" @@ -1194,6 +1208,12 @@ msgid "" " verify this in the URL bar: if your connection is encrypted, the address " "will begin with “https://”, rather than “http://”." msgstr "" +"Osobne informacije, kao što su lozinka za prijavu, koje putuju " +"neenkriptirane preko interneta, lako mogu biti presretnute od treće strane. " +"Ako se prijavljujete na bilo koju stranicu, trebali bi se pobrinuti da ta " +"stranica koristi HTTPS enkripciju, koja štiti od ovakvog prisluškivanja. To " +"možete verificirati u URL traci: ako je Vaša veza enkriptirana, adresa će " +"početi s \"https://\", umjesto sa \"http://\"." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1205,70 +1225,85 @@ msgid "" "external ref='media/secure-connections/https.png' " "md5='364bcbde7a649b0cea9ae178007c1a50'" msgstr "" +"external ref='media/secure-connections/https.png' " +"md5='364bcbde7a649b0cea9ae178007c1a50'" #: secure-connections.page:26 msgid "" "The following visualization shows what information is visible to " "eavesdroppers with and without Tor Browser and HTTPS encryption:" msgstr "" +"Sljedeća vizualizacija prikazujue informacije sa i bez Tor Brwsera i HTTPS " +"enkripcije, onako kako su vidljive nekom tko prisluškuje:" #: secure-connections.page:35 msgid "" "Click the “Tor” button to see what data is visible to observers when you're " "using Tor. The button will turn green to indicate that Tor is on." msgstr "" +"Kliknite \"Tor\" gumb kako bi vidjeli koji podatci su vidljivi promatračima " +"kad koristite Tor. Gumb će pozeleniti kako bi indicirao da je Tor uključen." #: secure-connections.page:42 msgid "" "Click the “HTTPS” button to see what data is visible to observers when " "you're using HTTPS. The button will turn green to indicate that HTTPS is on." msgstr "" +"Kliknite \"HTTPS\" gumb kako bi vijeli koji podatci su vidlji promatračima " +"kad koristite HTTPS. Gumb će pozeleniti kako bi indicirao da je HTTPS " +"uključen." #: secure-connections.page:49 msgid "" "When both buttons are green, you see the data that is visible to observers " "when you are using both tools." msgstr "" +"Kad su oba gumba zelena, vidite podatke koji su vidljivi promatračima kad " +"koristite oba alata." #: secure-connections.page:55 msgid "" "When both buttons are grey, you see the data that is visible to observers " "when you don't use either tool." msgstr "" +"Kad su oba gumba siva, vidite podatke koji su vidljivi pormatračima kad ne " +"koristite nijedan alat." #: secure-connections.page:62 msgid "Potentially visible data" -msgstr "" +msgstr "Potencijalno vidljivi podatci" #: secure-connections.page:70 msgid "The site being visited." -msgstr "" +msgstr "Stranica koja se posjećuje." #: secure-connections.page:81 msgid "Username and password used for authentication." -msgstr "" +msgstr "Korisničko ime i lozinka korišteni za autentikaciju." #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Podatci koji se prenose." #: secure-connections.page:103 msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" +"Mrežan lokacija računala korištenog za posjećivanje stranice (javna IP " +"adresa)." #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Koristi li se Tor ili ne." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "" +msgstr "Postavljanje Tor Browsera za sigurnost i korisnost" #: security-slider.page:10 msgid "Security Slider" -msgstr "" +msgstr "Sigurnosni klizač" #: security-slider.page:11 msgid "" diff --git a/pt/pt.po b/pt/pt.po index 8d730b3..f927fe4 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -894,6 +894,13 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"O Tor Browser muitas das vezes faz com que a sua ligação pareça como se esta" +" é proveniente de uma da parte do mundo totalmente diferente. Alguns sites " +"da Web, tal como bancos ou provedores de e-mail, podem interpretar isto como" +" um sinal de que a sua conta foi atacada ou comprometida, e bloqueiam-no. A " +"única maneira de resolver isto é seguir o procedimento recomendado pelo site" +" para a recuperação da conta, ou contactar os operadores e explicar a " +"situação." #: managing-identities.page:101 msgid "Changing identities and circuits" @@ -933,6 +940,13 @@ msgid "" "connections. Tor Browser will warn you that all activity and downloads will " "be stopped, so take this into account before clicking “New Identity”." msgstr "" +"Esta opção é útil se quiser impedir que a sua atividade subsequente do " +"navegador seja interligada com o que estava a fazer antes. Ao selecioná-la " +"irá fechar todos os separadores e janelas abertos, limpe toda a informação " +"privada, tais como cookies e histórico de navegação, e utilize os novos " +"circuitos Tor para todas as ligações. O Tor Browser irá avisá-lo de que " +"todas as atividades e transferências serão paradas, para ter isto em conta " +"antes de clicar em \"Nova Identidade\"." #: managing-identities.page:123 msgid "New Tor Circuit for this Site" @@ -963,6 +977,9 @@ msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Os serviços de cebola (anteriormente conhecidos como \"serviços ocultados\")" +" são serviços (tal como sites da Web) que só são acessíveis através da rede " +"Tor." #: onionsites.page:16 msgid "" @@ -1022,6 +1039,10 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Tal como qualquer outro site da Web, irá precisar de saber o endereço de um " +"serviço da cebola para se ligar a ele. Um endereço da cebola é uma sequência" +" de principalmente dezasseis letras e números aleatórios, seguido por " +"\".cebola\"." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" @@ -1033,6 +1054,9 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Se não for possível alcançar o serviço da cebola necessário, verifique se " +"digitou o endereço da cebola de 16 carateres corretamente: mesmo um erro " +"pequeno irá fazer com que o Tor Browser não consiga alcançar o site." #: onionsites.page:64 msgid "" @@ -1082,6 +1106,9 @@ msgid "" "methods that do not use Flash. These methods may be compatible with Tor " "Browser." msgstr "" +"Alguns sites da Web de vídeo (tal como o YouTube) oferecem uma alternativa " +"de métodos de fornecimento de vídeo que não utilizam \"Flash\". Estes " +"métodos poderão ser compatíveis com o Tor Browser." #: plugins.page:31 msgid "JavaScript" @@ -1180,30 +1207,44 @@ msgid "" "The following visualization shows what information is visible to " "eavesdroppers with and without Tor Browser and HTTPS encryption:" msgstr "" +"A visualização seguinte mostra que informação está visível para as escutas " +"indiscretas com e sem a encriptação do Tor Browser e HTTPS:" #: secure-connections.page:35 msgid "" "Click the “Tor” button to see what data is visible to observers when you're " "using Tor. The button will turn green to indicate that Tor is on." msgstr "" +"Clique no botão \"Tor\" para ver quais os dados que visíveis para os " +"observadores quando estiver a utilizar o Tor. O botão ficará verde para " +"indicar que o Tor está ligado." #: secure-connections.page:42 msgid "" "Click the “HTTPS” button to see what data is visible to observers when " "you're using HTTPS. The button will turn green to indicate that HTTPS is on." msgstr "" +"Clique no botão \"HTTPS\" para ver quais dados que estão visíveis para a " +"observadores quando estiver a utilizar HTTPS. O botão ficará verde para " +"indicar que HTTPS está ligado." #: secure-connections.page:49 msgid "" "When both buttons are green, you see the data that is visible to observers " "when you are using both tools." msgstr "" +"Quando ambos os botões estiverem verdes, irá ver quais os dados que estão " +"visíveis para os observadores quando estiver a utilizar ambas as " +"ferramentas." #: secure-connections.page:55 msgid "" "When both buttons are grey, you see the data that is visible to observers " "when you don't use either tool." msgstr "" +"Quando ambos os botões estiverem cinzentos, irá ver quais os dados que estão" +" visíveis para os observadores quando não estiver a utilizar ambas as " +"ferramentas." #: secure-connections.page:62 msgid "Potentially visible data" @@ -1297,6 +1338,9 @@ msgid "" "Increasing the level of the Security Slider will disable or partially " "disable certain browser features to protect against possible attacks." msgstr "" +"Aumentar o nível do 'Cursor de Segurança' irá desativar ou desativar " +"parcialmente determinadas funcionalidades do navegador para proteger contra " +"possíveis ataques." #: security-slider.page:42 msgid "High" @@ -1387,6 +1431,9 @@ msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" +"Obfs3 torna o tráfego do Tor aleatório, de modo que este não pareça o Tor ou" +" qualquer outro protocolo. As pontes de obfs3 irão trabalhar na maioria dos " +"lugares." #: transports.page:42 msgid "obfs4" @@ -1398,6 +1445,9 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 torna o tráfego do Tor aleatório, tal como ofs3, e também evita que os" +" censores encontrem as pontes pelas pesquisas da Internet. As pontes de " +"obfs4 são menos propensas a serem bloqueadas do que as pontes de obfs3." #: transports.page:56 msgid "Scramblesuit" @@ -1431,6 +1481,8 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" +"Todos estes transportes fazem com que pareça que \n" +"está a navegar em um site da Web principal em vez da utilização do Tor. meek-amazon faz com que pareça que está a utilizar os Serviços da Web da Amazon; meek-azure faz com que pareça que está a utilizar um site da Web da Microsoft; e meek-google faz com que pareça que está a utilizar a pesquisa do Google." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" @@ -1521,6 +1573,10 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" +"O Tor Browser está em constante desenvolvimento e alguns problemas são " +"conhecidos mas ainda não foram corrigidos. Por favor, verifique a página " +"<link xref=\"known-issues\">Problemas Conhecidos</link> para ver se o " +"problema que a ter já está listado lá." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Mar '17

09 Mar '17

commit be4c5c93a9bbcd49d9d700af179d8a075686da25 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 9 12:48:24 2017 +0000 Update translations for tor-browser-manual --- hr_HR/hr_HR.po | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++------- pt/pt.po | 46 +++++++++++++++++++++++++++++++---- 2 files changed, 110 insertions(+), 12 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index eecb6c6..d65eb4d 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -924,6 +924,13 @@ msgid "" "connections. Tor Browser will warn you that all activity and downloads will " "be stopped, so take this into account before clicking “New Identity”." msgstr "" +"Ova opcija je korisna kad želite spriječiti da se Vaša nastavna aktivnost u " +"pregledniku poveže sa onim što ste radili do sad. Odabirom te opcije će se " +"zatvoriti sve kartice i prozori, očistiti sve privatne informacije kao što " +"su kolačići i povijest pregledavanja, te će se koristiti novi Tor krugovi za" +" sve veze. Tor Browser će Vas upozoriti da će sva aktivnost i preuzimanja " +"bit zaustavljena, tako da to imajte na umu prije nego kliknete \"Novi " +"identitet\"." #: managing-identities.page:123 msgid "New Tor Circuit for this Site" @@ -940,32 +947,46 @@ msgid "" "or unlink your activity, nor does it affect your current connections to " "other websites." msgstr "" +"Ova opcija je korisna ako <link xref=\"about-tor-browser#how-tor-" +"works\">izlazni relej</link> kojeg koristite nije u mogućnosti povezati se " +"sa stranicom koju tražite, ili ako se ista ne učitava ispravno. Odabirom te " +"opcije će se trenutno aktivan kartica ili prozor ponovno učitati preko novog" +" Tor kruga. Druge otvorene kartice i prozori za istu stranicu će koristit " +"ovaj isti novi krug, kad se ponovno učitaju. Ova opcija ne čisti privatne " +"informacije, ne prekida povezanost Vaših aktivnosti, niti utječe na trenutne" +" veze prema drugim stranicama." #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Usluge koje su dostupne jedino korištenjem Tora" #: onionsites.page:10 msgid "Onion Services" -msgstr "" +msgstr "Onion usluge" #: onionsites.page:11 msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Onion usluge (prethodno poznate kao \"skrivene usluge\") su usluge (kao " +"stranice) koje su dostupne jedino kroz Tor mrežu." #: onionsites.page:16 msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" +"Onion usluge imaju nekoliko prednosti naspram običnih usluga na ne privatnom" +" webu:" #: onionsites.page:23 msgid "" "An onion services’s location and IP address are hidden, making it difficult " "for adversaries to censor it or identify its operators." msgstr "" +"Lokacija i IP adresa onion usluge su sakriveni, otežavajući tako " +"protivnicima da ih cenzuriraju ili da identificiraju operatore." #: onionsites.page:29 msgid "" @@ -973,6 +994,9 @@ msgid "" " you do not need to worry about <link xref=\"secure-connections\">connecting" " over HTTPS</link>." msgstr "" +"Sav promet između Tor korisnika i onion usluga je enkriptiran s kraja na " +"kraj, tako da se ne morate brinuti o <link xref=\"secure-" +"connections\">spajanju preko HTTPS-a</link>." #: onionsites.page:36 msgid "" @@ -981,10 +1005,13 @@ msgid "" " that it is connecting to the right location and that the connection is not " "being tampered with." msgstr "" +"Adresa onion usluge je automatski generirana, tako da operateri ne moraju " +"kupiti ime domene; .onion URL također pomaže Toru osigurati da se povezuje " +"sa pravom lokacijom i da se veza ne ometa." #: onionsites.page:46 msgid "How to access an onion service" -msgstr "" +msgstr "Kako pristupiti onion uslugama" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -996,6 +1023,8 @@ msgid "" "external ref='media/onionsites/onion_url.png' " "md5='f97f7fe10f07c3959c4430934974bbaa'" msgstr "" +"external ref='media/onionsites/onion_url.png' " +"md5='f97f7fe10f07c3959c4430934974bbaa'" #: onionsites.page:50 msgid "" @@ -1003,10 +1032,13 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Kao i sa bilo kojom drugom stranicom, morate znati adresu onion usluge kako " +"bi se spojili na nju. Onion usluga je niz od šesnaest uglavnom nasumičnih " +"slova i brojeva, koje prati \".onion\"." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" -msgstr "" +msgstr "Rješavanje problema" #: onionsites.page:59 msgid "" @@ -1014,6 +1046,9 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Ako ne možete pristupiti onion usluzi koju tražite, provjerite da ste unjeli" +" točno 16-znakovnu onion adresu: čak će i mala greška onemogućiti Tor " +"Browser da se spoji sa stranicom." #: onionsites.page:64 msgid "" @@ -1021,6 +1056,9 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" +"Ako se i dalje ne možete spojiti na onion uslugu, pokušajte kasnije. Možda " +"postoji trenutni problem sa vezom, ili su operateri dozvolili da stranica " +"ode offline bez upozorenja." #: onionsites.page:69 msgid "" @@ -1028,18 +1066,20 @@ msgid "" "connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's " "Onion Service</link>" msgstr "" +"Možete potvrditi da imate mogućnost spajanja na onion usluge spajanjem na " +"<link href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo onion uslugu</link>" #: plugins.page:6 msgid "How Tor Browser handles add-ons, plugins and JavaScript" -msgstr "" +msgstr "Kako Tor Browser rukuje dodatcima, priključcima i JavaScriptom" #: plugins.page:10 msgid "Plugins, add-ons and JavaScript" -msgstr "" +msgstr "Priključci, dodatci i JavaScript" #: plugins.page:13 msgid "Flash Player" -msgstr "" +msgstr "Flash Player" #: plugins.page:14 msgid "" @@ -1050,6 +1090,13 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" +"Video stranice, kao što je Vimeo, koriste Flash Player priključak kako bi " +"prikazali video sadržaj. Nažalost, taj software radi nezavisno od Tor " +"Browsera i ne može ga se jednostavno natjerati da sluša postavke Tor " +"Browserovog proxya. Na taj način može otkriti Vašu stvarnu lokaciju i IP " +"adresu operaterima stranice, ili nekom vanjsokm promatraču. Iz tog razloga, " +"Flasha je onemogućen pod zadano u Tor Browseru, i njegovo omugućavanje nije " +"preporučeno." #: plugins.page:23 msgid "" @@ -1057,10 +1104,13 @@ msgid "" "methods that do not use Flash. These methods may be compatible with Tor " "Browser." msgstr "" +"Neke video stranice (kao YouTube) pružaju alternativne metode dostave videa " +"koje ne koriste Flash. Ove metode bi mogle biti kompatibilne sa Tor " +"Browserom." #: plugins.page:31 msgid "JavaScript" -msgstr "" +msgstr "JavaScript" #: plugins.page:32 msgid "" @@ -1069,6 +1119,10 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"JavaScript je programski jezik kojeg stranice koriste kako bi pružile " +"interaktivne elemente kao što je video, animacija, audio i statusne " +"vremenske crte. Nažalost, JavaScript također može omogućiti napade na " +"sigurnost preglednika, što može dovesti do deanonimizacije." #: plugins.page:39 msgid "" @@ -1076,6 +1130,10 @@ msgid "" "icon at the top-left of the window, which allows you to control the " "JavaScript that runs on individual web pages, or to block it entirely." msgstr "" +"Tor Browser uključuje dodatak NoScript, kojem se pristupa kroz \"S\" ikonu u" +" gornjem lijevom kutu prozora. NoScript Vam daje kontrolu nad pokrenutim " +"JavaScript elementima na individualnim stranicama, ili mogućnost da ih u " +"potpunosti blokirate." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1087,6 +1145,8 @@ msgid "" "external ref='media/plugins/noscript_menu.png' " "md5='df9e684b76a3c2e2bdcb879a19c20471'" msgstr "" +"external ref='media/plugins/noscript_menu.png' " +"md5='df9e684b76a3c2e2bdcb879a19c20471'" #: plugins.page:47 msgid "" diff --git a/pt/pt.po b/pt/pt.po index 4424669..8d730b3 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -2,7 +2,6 @@ # Manuela Silva <manuela.silva(a)sky.com>, 2016 # Rui Neves <ninjadesaiote(a)gmail.com>, 2016 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2016 -# Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2016 # Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Koh Pyreit <inactive+kohpyreit(a)transifex.com>, 2016 # Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 @@ -620,6 +619,12 @@ msgid "" "ask your network administrator for guidance. If your connection does not use" " a proxy, click “Continue”." msgstr "" +"O ecrã seguinte pergunta se a sua ligação utiliza um proxy. Na maioria dos " +"casos, isto não é necessário. Normalmente irá saber se precisa de responder " +"\"Sim\", porque serão utilizadas as mesmas definições pelos outros " +"navegadores no seu sistema. Se possível, peça ao seu administrador da rede " +"por alguma ajuda. Se a sua ligação não utilizar um proxy, clique em " +"\"Continuar\"." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -728,6 +733,8 @@ msgid "" "Tor Browser can also be started from the command line by running the " "following command from inside the Tor Browser directory:" msgstr "" +"O Tor Browser também pode ser iniciado a partir da linha de comandos, " +"executando o seguinte comando dentro da diretoria do Tor Browser:" #: known-issues.page:66 #, no-wrap @@ -757,6 +764,11 @@ msgid "" "trackers, and advertising beacons, all of which can link your activity " "across different sites." msgstr "" +"Quando visita um site da Web, não são só os operadores desse site da Web que" +" podem registar a informação sobre a sua visita. A maioria dos sites da Web " +"agora utilizam inúmeros serviços de terceiros, incluindo os botões " +"\"Gostar\" das redes sociais, analíticas, rastreadores, e publicidade, e " +"todos podem interligar a sua atividade entre sites diferentes." #: managing-identities.page:20 msgid "" @@ -766,6 +778,11 @@ msgid "" " Browser includes some additional features that help you control what " "information can be tied to your identity." msgstr "" +"Ao utilizar a rede Tor faz com que os observadores deixem de poder descobrir" +" a sua localização exata e o endereço de IP, mas mesmo sem essa informação " +"estes poderão interligar diferentes áreas da sua atividade. Por este motivo," +" o Tor Browser inclui algumas funcionalidades adicionais que o ajudam a " +"controlar qual a informação que pode ser associada com a sua identidade." #: managing-identities.page:29 msgid "The URL bar" @@ -779,6 +796,12 @@ msgid "" " be served over two different Tor circuits, so the tracker will not know " "that both connections originate from your browser." msgstr "" +"O Tor Browser centra a sua experiência na Web em torno do seu relacionamento" +" com o site da Web na barra do URL. Mesmo se visitar dois sites diferentes " +"que utilizam o mesmo serviço de rastreamento de terceiros, o Tor Browser irá" +" forçar o conteúdo para ser servido por mais de dois circuitos Tor " +"diferentes, assim o rastreador não vai saber que ambas as ligações são " +"originárias do seu navegador." #: managing-identities.page:38 msgid "" @@ -787,6 +810,10 @@ msgid "" "single website in separate tabs or windows, without any loss of " "functionality." msgstr "" +"Por outro lado, todas as ligações para um único endereço do site da Web " +"serão efetuadas durante o mesmo circuito Tor, o que significa que navegar em" +" páginas diferentes de um único site da web em separadores separados ou " +"janelas, sem qualquer perda de funcionalidade." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -833,6 +860,13 @@ msgid "" "you reveal to the websites you browse. Logging in using Tor Browser is also " "useful if the website you are trying to reach is censored on your network." msgstr "" +"Se iniciar a sessão num site da Web utilizando um navegador comum, também " +"pode revelar o seu endereço de IP e localização geográfica no processo. O " +"mesmo é frequentemente verdade quando envia uma mensagem. Se iniciar a " +"sessão nas redes sociais ou contas de e-mail utilizando o Tor Browser " +"permite-lhe escolher exatamente qual a informação que revela aos sites da " +"Web onde navega. Ao iniciar a sessão com o Tor Browser também é útil se o " +"site da Web que está a tentar aceder está a censurar a sua rede." #: managing-identities.page:72 msgid "" @@ -1322,7 +1356,7 @@ msgstr "Tipos de transporte ligáveis" #: transports.page:10 msgid "Pluggable Transports" -msgstr "Transportes ligáveis" +msgstr "Transportes Ligáveis" #: transports.page:12 msgid "" @@ -1331,14 +1365,18 @@ msgid "" "Provider or other authority is actively blocking connections to the Tor " "network." msgstr "" +"Transportes ligáveis são ferramentas que o Tor pode utilizar para disfarçar " +"o tráfego que este envia. Isto pode ser útil em situações onde um Provedor " +"de Serviços da Internet ou outra autoridade está a bloquear ativamente as " +"ligações à rede Tor." #: transports.page:21 msgid "" "Currently there are six pluggable transports available, but more are being " "developed." msgstr "" -"Currently there are six pluggable transports available, but more are being " -"developed." +"Atualmente existem seis transportes ligáveis disponíveis, mas ainda estão em" +" desenvolvimento." #: transports.page:28 msgid "obfs3"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 09 Mar '17

09 Mar '17

commit 56cf477ac44705f1c4f15a1e6565a38116ed67d4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 9 12:45:08 2017 +0000 Update translations for bridgedb_completed --- pt/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index d4b4448..8a3c1d0 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-07 14:26+0000\n" +"PO-Revision-Date: 2017-03-09 12:23+0000\n" "Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -237,7 +237,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "A BridgeDB pode disponibilizar pontes com diversos %stipos de Transportes de Conexão%s, que podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difícil o rastreamento do seu tráfego na Internet para determinar se está a utilizar o Tor.\n" +msgstr "BridgeDB pode disponibilizar pontes com diversos %stipos de Transportes Ligáveis%s,\nque podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difícil\npara alguém monitorizar o seu tráfego na Internet para determinar se está a utilizar o Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -245,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Também estão disponíveis algumas ligações com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com o IPv6.\n\n" +msgstr "Também estão disponíveis algumas pontes com endereços de IPv6, embora\nalguns Transportes Ligáveis não são compatíveis com IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -259,7 +259,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem quaisquer Pluggable Transports %s, o que poderá não parecer ótimo, mas estes, ainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" +msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer Transportes Ligáveis %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -300,7 +300,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc." +msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Transportes Ligáveis que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 09 Mar '17

09 Mar '17

commit a44216b8ff01c8b85be4c0fc35e969594835e6f7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 9 12:45:04 2017 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index d4b4448..8a3c1d0 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-07 14:26+0000\n" +"PO-Revision-Date: 2017-03-09 12:23+0000\n" "Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -237,7 +237,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "A BridgeDB pode disponibilizar pontes com diversos %stipos de Transportes de Conexão%s, que podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difícil o rastreamento do seu tráfego na Internet para determinar se está a utilizar o Tor.\n" +msgstr "BridgeDB pode disponibilizar pontes com diversos %stipos de Transportes Ligáveis%s,\nque podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difícil\npara alguém monitorizar o seu tráfego na Internet para determinar se está a utilizar o Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -245,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Também estão disponíveis algumas ligações com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com o IPv6.\n\n" +msgstr "Também estão disponíveis algumas pontes com endereços de IPv6, embora\nalguns Transportes Ligáveis não são compatíveis com IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -259,7 +259,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem quaisquer Pluggable Transports %s, o que poderá não parecer ótimo, mas estes, ainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" +msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer Transportes Ligáveis %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -300,7 +300,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc." +msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Transportes Ligáveis que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:"

1 0