May 2016 - tor-commits - lists.torproject.org

[tor/master] remove an unneeded layer of indentation
by nickm＠torproject.org 27 May '16

27 May '16

commit 500c4bf8075f6530dbbcf1e63bac749d16f5afee Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 27 10:01:37 2016 -0400 remove an unneeded layer of indentation no actual behavior changes --- src/or/directory.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 04a3ced..b086fc7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2875,23 +2875,21 @@ static int handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) { (void) args; /* unused */ - { - const char *frontpage = get_dirportfrontpage(); - - if (frontpage) { - size_t dlen; - dlen = strlen(frontpage); - /* Let's return a disclaimer page (users shouldn't use V1 anymore, - and caches don't fetch '/', so this is safe). */ - - /* [We don't check for write_bucket_low here, since we want to serve - * this page no matter what.] */ - write_http_response_header_impl(conn, dlen, "text/html", "identity", - NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME); - connection_write_to_buf(frontpage, dlen, TO_CONN(conn)); - } else { - write_http_status_line(conn, 404, "Not found"); - } + const char *frontpage = get_dirportfrontpage(); + + if (frontpage) { + size_t dlen; + dlen = strlen(frontpage); + /* Let's return a disclaimer page (users shouldn't use V1 anymore, + and caches don't fetch '/', so this is safe). */ + + /* [We don't check for write_bucket_low here, since we want to serve + * this page no matter what.] */ + write_http_response_header_impl(conn, dlen, "text/html", "identity", + NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME); + connection_write_to_buf(frontpage, dlen, TO_CONN(conn)); + } else { + write_http_status_line(conn, 404, "Not found"); } return 0; }

1 0

[tor/master] Merge remote-tracking branch 'arma/task19035-fixedup'
by nickm＠torproject.org 27 May '16

27 May '16

commit 1e5ad15688ee3f3660fe35cab23022126b55262d Merge: 617b920 3b83da1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 13:22:16 2016 -0400 Merge remote-tracking branch 'arma/task19035-fixedup' changes/task19035 | 5 ++ configure.ac | 6 -- src/or/circuitbuild.c | 3 - src/or/control.c | 3 - src/or/directory.c | 197 ++++------------------------------------- src/or/or.h | 8 -- src/test/test_dir_handle_get.c | 46 ---------- 7 files changed, 22 insertions(+), 246 deletions(-)

1 0

[tor/master] get rid of one more piece of --enable-instrument-downloads
by nickm＠torproject.org 27 May '16

27 May '16

commit 1ce1214d687eac46ced966793862bfafb5a6f323 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 27 12:32:02 2016 -0400 get rid of one more piece of --enable-instrument-downloads --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index d7db0db..b5e4b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,6 @@ CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common" #XXXX020 We should make these enabled or not, before 0.2.0.x-final AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only])) -AC_ARG_ENABLE(instrument-downloads, - AS_HELP_STRING(--enable-instrument-downloads, [instrument downloads of directory resources etc.])) AC_ARG_ENABLE(static-openssl, AS_HELP_STRING(--enable-static-openssl, [link against a static openssl library. Requires --with-openssl-dir])) AC_ARG_ENABLE(static-libevent,

1 0

[tor/master] Disable GET /tor/bytes.txt and GETINFO dir-usage
by nickm＠torproject.org 27 May '16

27 May '16

commit 11d52a449c61b24588c17688892e07fa395ffd0c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 15:31:48 2016 -0400 Disable GET /tor/bytes.txt and GETINFO dir-usage Remove support for "GET /tor/bytes.txt" DirPort request, and "GETINFO dir-usage" controller request, which were only available via a compile-time option in Tor anyway. Feature was added in 0.2.2.1-alpha. Resolves ticket 19035. --- changes/task19035 | 5 ++ configure.ac | 4 - src/or/circuitbuild.c | 3 - src/or/control.c | 3 - src/or/directory.c | 165 +---------------------------------------- src/or/or.h | 4 +- src/test/test_dir_handle_get.c | 46 ------------ 7 files changed, 8 insertions(+), 222 deletions(-) diff --git a/changes/task19035 b/changes/task19035 new file mode 100644 index 0000000..15c376f --- /dev/null +++ b/changes/task19035 @@ -0,0 +1,5 @@ + o Removed features: + - Remove support for "GET /tor/bytes.txt" DirPort request, and + "GETINFO dir-usage" controller request, which were only available + via a compile-time option in Tor anyway. Feature was added in + 0.2.2.1-alpha. Resolves ticket 19035. diff --git a/configure.ac b/configure.ac index bd50577..d7db0db 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,6 @@ if test "$enable_system_torrc" = "no"; then fi AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes") -if test "x$enable_instrument_downloads" = "xyes"; then - AC_DEFINE(INSTRUMENT_DOWNLOADS, 1, - [Defined if we want to keep track of how much of each kind of resource we download.]) -fi AC_ARG_ENABLE(transparent, AS_HELP_STRING(--disable-transparent, [disable transparent proxy support]), diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e6fe3f0..6941b43 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -884,14 +884,12 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) */ circuit_pick_create_handshake(&cc.cell_type, &cc.handshake_type, circ->cpath->extend_info); - note_request("cell: create", 1); } else { /* We are not an OR, and we're building the first hop of a circuit to a * new OR: we can be speedy and use CREATE_FAST to save an RSA operation * and a DH operation. */ cc.cell_type = CELL_CREATE_FAST; cc.handshake_type = ONION_HANDSHAKE_TYPE_FAST; - note_request("cell: create fast", 1); } len = onion_skin_create(cc.handshake_type, @@ -1024,7 +1022,6 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) ec.create_cell.handshake_len = len; log_info(LD_CIRC,"Sending extend relay cell."); - note_request("cell: extend", 1); { uint8_t command = 0; uint16_t payload_len=0; diff --git a/src/or/control.c b/src/or/control.c index 862c836..b503591 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1724,8 +1724,6 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "limits/max-mem-in-queues")) { tor_asprintf(answer, U64_FORMAT, U64_PRINTF_ARG(get_options()->MaxMemInQueues)); - } else if (!strcmp(question, "dir-usage")) { - *answer = directory_dump_request_log(); } else if (!strcmp(question, "fingerprint")) { crypto_pk_t *server_key; if (!server_mode(get_options())) { @@ -2558,7 +2556,6 @@ static const getinfo_item_t getinfo_items[] = { "Username under which the tor process is running."), ITEM("process/descriptor-limit", misc, "File descriptor limit."), ITEM("limits/max-mem-in-queues", misc, "Actual limit on memory in queues"), - ITEM("dir-usage", misc, "Breakdown of bytes transferred over DirPort."), PREFIX("desc-annotations/id/", dir, "Router annotations by hexdigest."), PREFIX("dir/server/", dir,"Router descriptors as retrieved from a DirPort."), PREFIX("dir/status/", dir, diff --git a/src/or/directory.c b/src/or/directory.c index a3ade8f..04a3ced 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -80,7 +80,6 @@ static void dir_routerdesc_download_failed(smartlist_t *failed, int was_descriptor_digests); static void dir_microdesc_download_failed(smartlist_t *failed, int status_code); -static void note_client_request(int purpose, int compressed, size_t bytes); static int client_likes_consensus(networkstatus_t *v, const char *want_url); static void directory_initiate_command_rend( @@ -1852,7 +1851,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) char *body; char *headers; char *reason = NULL; - size_t body_len = 0, orig_len = 0; + size_t body_len = 0; int status_code; time_t date_header = 0; long apparent_skew; @@ -1862,7 +1861,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) int allow_partial = (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO || conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC); - int was_compressed = 0; time_t now = time(NULL); int src_code; @@ -1881,7 +1879,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) return -1; /* case 1, fall through */ } - orig_len = body_len; if (parse_http_response(headers, &status_code, &date_header, &compression, &reason) < 0) { @@ -1999,7 +1996,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) tor_free(body); body = new_body; body_len = new_len; - was_compressed = 1; } } @@ -2459,7 +2455,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) break; } } - note_client_request(conn->base_.purpose, was_compressed, orig_len); tor_free(body); tor_free(headers); tor_free(reason); return 0; } @@ -2660,129 +2655,6 @@ write_http_response_header(dir_connection_t *conn, ssize_t length, cache_lifetime); } -#if defined(INSTRUMENT_DOWNLOADS) || defined(RUNNING_DOXYGEN) -/* DOCDOC */ -typedef struct request_t { - uint64_t bytes; /**< How many bytes have we transferred? */ - uint64_t count; /**< How many requests have we made? */ -} request_t; - -/** Map used to keep track of how much data we've up/downloaded in what kind - * of request. Maps from request type to pointer to request_t. */ -static strmap_t *request_map = NULL; - -/** Record that a client request of purpose was made, and that - * bytes bytes of possibly compressed data were sent/received. - * Used to keep track of how much we've up/downloaded in what kind of - * request. */ -static void -note_client_request(int purpose, int compressed, size_t bytes) -{ - char *key; - const char *kind = NULL; - switch (purpose) { - case DIR_PURPOSE_FETCH_CONSENSUS: kind = "dl/consensus"; break; - case DIR_PURPOSE_FETCH_CERTIFICATE: kind = "dl/cert"; break; - case DIR_PURPOSE_FETCH_STATUS_VOTE: kind = "dl/vote"; break; - case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES: kind = "dl/detached_sig"; - break; - case DIR_PURPOSE_FETCH_SERVERDESC: kind = "dl/server"; break; - case DIR_PURPOSE_FETCH_EXTRAINFO: kind = "dl/extra"; break; - case DIR_PURPOSE_UPLOAD_DIR: kind = "dl/ul-dir"; break; - case DIR_PURPOSE_UPLOAD_VOTE: kind = "dl/ul-vote"; break; - case DIR_PURPOSE_UPLOAD_SIGNATURES: kind = "dl/ul-sig"; break; - case DIR_PURPOSE_FETCH_RENDDESC_V2: kind = "dl/rend2"; break; - case DIR_PURPOSE_UPLOAD_RENDDESC_V2: kind = "dl/ul-rend2"; break; - } - if (kind) { - tor_asprintf(&key, "%s%s", kind, compressed?".z":""); - } else { - tor_asprintf(&key, "unknown purpose (%d)%s", - purpose, compressed?".z":""); - } - note_request(key, bytes); - tor_free(key); -} - -/** Helper: initialize the request map to instrument downloads. */ -static void -ensure_request_map_initialized(void) -{ - if (!request_map) - request_map = strmap_new(); -} - -/** Called when we just transmitted or received bytes worth of data - * because of a request of type key (an arbitrary identifier): adds - * bytes to the total associated with key. */ -void -note_request(const char *key, size_t bytes) -{ - request_t *r; - ensure_request_map_initialized(); - - r = strmap_get(request_map, key); - if (!r) { - r = tor_malloc_zero(sizeof(request_t)); - strmap_set(request_map, key, r); - } - r->bytes += bytes; - r->count++; -} - -/** Return a newly allocated string holding a summary of bytes used per - * request type. */ -char * -directory_dump_request_log(void) -{ - smartlist_t *lines; - char *result; - strmap_iter_t *iter; - - ensure_request_map_initialized(); - - lines = smartlist_new(); - - for (iter = strmap_iter_init(request_map); - !strmap_iter_done(iter); - iter = strmap_iter_next(request_map, iter)) { - const char *key; - void *val; - request_t *r; - strmap_iter_get(iter, &key, &val); - r = val; - smartlist_add_asprintf(lines, "%s "U64_FORMAT" "U64_FORMAT"\n", - key, U64_PRINTF_ARG(r->bytes), U64_PRINTF_ARG(r->count)); - } - smartlist_sort_strings(lines); - result = smartlist_join_strings(lines, "", 0, NULL); - SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp)); - smartlist_free(lines); - return result; -} -#else -static void -note_client_request(int purpose, int compressed, size_t bytes) -{ - (void)purpose; - (void)compressed; - (void)bytes; -} - -void -note_request(const char *key, size_t bytes) -{ - (void)key; - (void)bytes; -} - -char * -directory_dump_request_log(void) -{ - return tor_strdup("Not supported."); -} -#endif - /** Decide whether a client would accept the consensus we have. * * Clients can say they only want a consensus if it's signed by more @@ -2897,8 +2769,6 @@ static int handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args); static int handle_get_rendezvous2(dir_connection_t *conn, const get_handler_args_t *args); -static int handle_get_bytes(dir_connection_t *conn, - const get_handler_args_t *args); static int handle_get_robots(dir_connection_t *conn, const get_handler_args_t *args); static int handle_get_networkstatus_bridges(dir_connection_t *conn, @@ -2915,7 +2785,6 @@ static const url_table_ent_t url_table[] = { { "/tor/extra/", 1, handle_get_descriptor }, { "/tor/keys/", 1, handle_get_keys }, { "/tor/rendezvous2/", 1, handle_get_rendezvous2 }, - { "/tor/bytes.txt", 0, handle_get_bytes }, { "/tor/robots.txt", 0, handle_get_robots }, { "/tor/networkstatus-bridges", 0, handle_get_networkstatus_bridges }, { NULL, 0, NULL }, @@ -3005,7 +2874,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, static int handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) { - const char *url = args->url; + (void) args; /* unused */ { const char *frontpage = get_dirportfrontpage(); @@ -3017,7 +2886,6 @@ handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) /* [We don't check for write_bucket_low here, since we want to serve * this page no matter what.] */ - note_request(url, dlen); write_http_response_header_impl(conn, dlen, "text/html", "identity", NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME); connection_write_to_buf(frontpage, dlen, TO_CONN(conn)); @@ -3041,7 +2909,6 @@ handle_get_current_consensus(dir_connection_t *conn, { /* v3 network status fetch. */ smartlist_t *dir_fps = smartlist_new(); - const char *request_type = NULL; long lifetime = NETWORKSTATUS_CACHE_LIFETIME; if (1) { @@ -3090,7 +2957,6 @@ handle_get_current_consensus(dir_connection_t *conn, tor_free(flavor); smartlist_add(dir_fps, fp); } - request_type = compressed?"v3.z":"v3"; lifetime = (v && v->fresh_until > now) ? v->fresh_until - now : 0; } @@ -3145,8 +3011,6 @@ handle_get_current_consensus(dir_connection_t *conn, } } - // note_request(request_type,dlen); - (void) request_type; write_http_response_header(conn, -1, compressed, smartlist_len(dir_fps) == 1 ? lifetime : 0); conn->fingerprint_stack = dir_fps; @@ -3331,7 +3195,6 @@ handle_get_descriptor(dir_connection_t *conn, const get_handler_args_t *args) size_t dlen; int res; const char *msg; - const char *request_type = NULL; int cache_lifetime = 0; int is_extra = !strcmpstart(url,"/tor/extra/"); url += is_extra ? strlen("/tor/extra/") : strlen("/tor/server/"); @@ -3342,24 +3205,16 @@ handle_get_descriptor(dir_connection_t *conn, const get_handler_args_t *args) is_extra); if (!strcmpstart(url, "fp/")) { - request_type = compressed?"/tor/server/fp.z":"/tor/server/fp"; if (smartlist_len(conn->fingerprint_stack) == 1) cache_lifetime = ROUTERDESC_CACHE_LIFETIME; } else if (!strcmpstart(url, "authority")) { - request_type = compressed?"/tor/server/authority.z": - "/tor/server/authority"; cache_lifetime = ROUTERDESC_CACHE_LIFETIME; } else if (!strcmpstart(url, "all")) { - request_type = compressed?"/tor/server/all.z":"/tor/server/all"; cache_lifetime = FULL_DIR_CACHE_LIFETIME; } else if (!strcmpstart(url, "d/")) { - request_type = compressed?"/tor/server/d.z":"/tor/server/d"; if (smartlist_len(conn->fingerprint_stack) == 1) cache_lifetime = ROUTERDESC_BY_DIGEST_CACHE_LIFETIME; - } else { - request_type = "/tor/server/?"; } - (void) request_type; /* usable for note_request. */ if (!strcmpstart(url, "d/")) conn->dir_spool_src = is_extra ? DIR_SPOOL_EXTRA_BY_DIGEST : DIR_SPOOL_SERVER_BY_DIGEST; @@ -3574,22 +3429,6 @@ handle_get_networkstatus_bridges(dir_connection_t *conn, return 0; } -/** Helper function for GET /tor/bytes.txt - */ -static int -handle_get_bytes(dir_connection_t *conn, const get_handler_args_t *args) -{ - (void)args; - { - char *bytes = directory_dump_request_log(); - size_t len = strlen(bytes); - write_http_response_header(conn, len, 0, 0); - connection_write_to_buf(bytes, len, TO_CONN(conn)); - tor_free(bytes); - } - return 0; -} - /** Helper function for GET robots.txt or /tor/robots.txt */ static int handle_get_robots(dir_connection_t *conn, const get_handler_args_t *args) diff --git a/src/or/or.h b/src/or/or.h index 86664d4..a1b09b5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -17,9 +17,7 @@ #if defined(__clang_analyzer__) || defined(__COVERITY__) /* If we're building for a static analysis, turn on all the off-by-default * features. */ -#ifndef INSTRUMENT_DOWNLOADS -#define INSTRUMENT_DOWNLOADS 1 -#endif +/* XXX029 Nothing left here? Take out or leave in? */ #endif #ifdef HAVE_UNISTD_H diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 05657ca..0c6530d 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -224,51 +224,6 @@ test_dir_handle_get_robots_txt(void *data) tor_free(body); } -static void -test_dir_handle_get_bytes_txt(void *data) -{ - dir_connection_t *conn = NULL; - char *header = NULL; - char *body = NULL; - size_t body_used = 0, body_len = 0; - char buff[30]; - char *exp_body = NULL; - (void) data; - - exp_body = directory_dump_request_log(); - body_len = strlen(exp_body); - - MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); - - conn = dir_connection_new(tor_addr_family(&MOCK_TOR_ADDR)); - - tt_int_op(directory_handle_command_get(conn, GET("/tor/bytes.txt"), NULL, 0), - OP_EQ, 0); - fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, - &body, &body_used, body_len+1, 0); - - tt_assert(header); - tt_assert(body); - - tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); - tt_assert(strstr(header, "Content-Type: text/plain\r\n")); - tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Pragma: no-cache\r\n")); - - tor_snprintf(buff, sizeof(buff), "Content-Length: %ld\r\n", (long) body_len); - tt_assert(strstr(header, buff)); - - tt_int_op(body_used, OP_EQ, strlen(body)); - tt_str_op(body, OP_EQ, exp_body); - - done: - UNMOCK(connection_write_to_buf_impl_); - connection_free_(TO_CONN(conn)); - tor_free(header); - tor_free(body); - tor_free(exp_body); -} - #define RENDEZVOUS2_GET(descid) GET("/tor/rendezvous2/" descid) static void test_dir_handle_get_rendezvous2_not_found_if_not_encrypted(void *data) @@ -2484,7 +2439,6 @@ struct testcase_t dir_handle_get_tests[] = { DIR_HANDLE_CMD(v1_command_not_found, 0), DIR_HANDLE_CMD(v1_command, 0), DIR_HANDLE_CMD(robots_txt, 0), - DIR_HANDLE_CMD(bytes_txt, 0), DIR_HANDLE_CMD(rendezvous2_not_found_if_not_encrypted, 0), DIR_HANDLE_CMD(rendezvous2_not_found, 0), DIR_HANDLE_CMD(rendezvous2_on_encrypted_conn_with_invalid_desc_id, 0),

1 0

[tor/master] Check linking of hardening options, give better warnings if it fails.
by nickm＠torproject.org 27 May '16

27 May '16

commit d9080f5d3a03a5a241f7f6b2234d69a32f27a531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 09:37:27 2016 -0400 Check linking of hardening options, give better warnings if it fails. Previously we'd only check whether the hardening options succeeded at the compile step. Now we'll try to link with them too, and tell the user in advance if something seems likely to go wrong. Closes ticket 18895. --- changes/bug18895 | 6 ++++++ configure.ac | 25 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/changes/bug18895 b/changes/bug18895 new file mode 100644 index 0000000..9ad857c --- /dev/null +++ b/changes/bug18895 @@ -0,0 +1,6 @@ + o Minor features (build): + - When building on a system without runtime support for some of the + runtime hardening options, try to log a useful warning at configuration + time, rather than an incomprehensible warning at link time. + If expensive hardening was requested, this warning becomes an error. + Closes ticket 18895. diff --git a/configure.ac b/configure.ac index 8eb57f8..d658ef6 100644 --- a/configure.ac +++ b/configure.ac @@ -787,14 +787,29 @@ m4_ifdef([AS_VAR_IF],[ TOR_CHECK_CFLAGS(-fPIE) TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check") fi - TOR_TRY_COMPILE_WITH_CFLAGS(-ftrapv, , CFLAGS_FTRAPV="-ftrapv", true) - TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, , CFLAGS_FWRAPV="-fwrapv", true) + TOR_TRY_COMPILE_WITH_CFLAGS(-ftrapv, also_link, CFLAGS_FTRAPV="-ftrapv", true) + TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, also_link, CFLAGS_FWRAPV="-fwrapv", true) + if test "$tor_cv_cflags__ftrapv" = "yes" && test "$tor_can_link__ftrapv" != "yes"; then + AC_MSG_WARN([The compiler supports -ftrapv, but for some reason I was not able to link with -ftrapv. Are you missing run-time support? Run-time hardening will not work as well as it should.]) + fi fi if test "x$enable_expensive_hardening" = "xyes"; then - TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=address], , CFLAGS_ASAN="-fsanitize=address", true) - TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=undefined], , CFLAGS_UBSAN="-fsanitize=undefined", true) - TOR_CHECK_CFLAGS([-fno-omit-frame-pointer]) + if test "$tor_cv_cflags__ftrapv" != "yes"; then + AC_MSG_ERROR([You requested expensive hardening, but the compiler does not seem to support -ftrapv.]) + fi + + TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=address], also_link, CFLAGS_ASAN="-fsanitize=address", true) + if test "$tor_cv_cflags__fsanitize_address" = "yes" && test "$tor_can_link__fsanitize_address" != "yes"; then + AC_MSG_ERROR([The compiler supports -fsanitize=address, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libubsan.so, and with Clang you need libclang_rt.ubsan*]) + fi + + TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=undefined], also_link, CFLAGS_UBSAN="-fsanitize=undefined", true) + if test "$tor_cv_cflags__fsanitize_address" = "yes" && test "$tor_can_link__fsanitize_address" != "yes"; then + AC_MSG_ERROR([The compiler supports -fsanitize=undefined, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.so, and with Clang you need libclang_rt.ubsan*]) + fi + +TOR_CHECK_CFLAGS([-fno-omit-frame-pointer]) fi CFLAGS_BUGTRAP="$CFLAGS_FTRAPV $CFLAGS_ASAN $CFLAGS_UBSAN"

1 0

[tor/master] Merge remote-tracking branch 'public/hardening_flags_must_link'
by nickm＠torproject.org 27 May '16

27 May '16

commit 617b9205515a8ee5f9ddf4fac14eff5178111641 Merge: c404905 d9080f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 12:52:39 2016 -0400 Merge remote-tracking branch 'public/hardening_flags_must_link' changes/bug18895 | 6 ++++++ configure.ac | 25 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-)

1 0

[doctor/master] Check ORPort reachability
by atagar＠torproject.org 27 May '16

27 May '16

commit 138ac2c58b58297ef8301419d97717919ffb6790 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 27 09:11:17 2016 -0700 Check ORPort reachability Simple check that was requested at the Berlin dev meeting to see if the authority's ORPort is reachable... https://trac.torproject.org/projects/tor/ticket/18176 This has been pending IPv6 support. Now that DocTor's running on carinatum this can become a thing! https://trac.torproject.org/projects/tor/ticket/17298 --- consensus_health_checker.py | 37 +++++++++++++++---------------------- data/consensus_health.cfg | 1 + 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index c521e64..c1aed79 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -325,6 +325,7 @@ def run_checks(consensuses, votes): is_recommended_versions, bad_exits_in_sync, bandwidth_authorities_in_sync, + is_orport_reachable, ) all_issues = [] @@ -580,7 +581,7 @@ def unmeasured_relays(latest_consensus, consensuses, votes): percentage = 100 * unmeasured / total if percentage >= 5: - issues.append(Issue(Runlevel.NOTICE, 'TOO_MANY_UNMEASURED_RELAYS', authority = authority, unmeasured = unmeasured, total = total, percentage = percentage, to = [authority])) + issues.append(Issue(Runlevel.NOTICE, 'TOO_MANY_UNMEASURED_RELAYS', authority = authority.nickname, unmeasured = unmeasured, total = total, percentage = percentage, to = [authority])) return issues @@ -613,6 +614,7 @@ def has_expected_fingerprints(latest_consensus, consensuses, votes): "Checks that the authorities have the fingerprints that we expect." issues = [] + for desc in latest_consensus.routers.values(): if desc.nickname in DIRECTORY_AUTHORITIES and Flag.NAMED in desc.flags: expected_fingerprint = DIRECTORY_AUTHORITIES[desc.nickname].fingerprint @@ -686,7 +688,7 @@ def bad_exits_in_sync(latest_consensus, consensuses, votes): attr.append('without flag: %s' % ', '.join(without_flag)) if not_in_vote: - attr.append('not in consensus: %s' % ', '.join(not_in_vote)) + attr.append('not in vote: %s' % ', '.join(not_in_vote)) issues.append(Issue(Runlevel.NOTICE, 'BADEXIT_OUT_OF_SYNC', fingerprint = fingerprint, counts = ', '.join(attr), to = bad_exits.keys())) @@ -719,10 +721,9 @@ def bandwidth_authorities_in_sync(latest_consensus, consensuses, votes): return Issue(Runlevel.NOTICE, 'BANDWIDTH_AUTHORITIES_OUT_OF_SYNC', authorities = ', '.join(entries), to = measurement_counts.keys()) -def is_ipv6_orport_reachable(latest_consensus, consensuses, votes): +def is_orport_reachable(latest_consensus, consensuses, votes): """ - Simple check to see if we can reach the authority's IPv6 ORPort when it has - one. + Simple check to see if we can reach the authority's ORPort. """ issues = [] @@ -734,22 +735,14 @@ def is_ipv6_orport_reachable(latest_consensus, consensuses, votes): continue # authority isn't in the consensus for address, port, is_ipv6 in desc.or_addresses: - if is_ipv6: - # TODO: Ok, now for the bit I'm unfamiliar with. How do we ping - # this endpoint? On cappadocicum seems we're missing something... - # - # % ping6 2001:858:2:2:aabb:0:563b:1526 - # connect: Network is unreachable - # - # Do we need a tunnel? 6to4 configuration? - # - # https://wiki.debian.org/DebianIPv6#IPv6_6to4_Configuration - # - # Green to this space so lets ask... - - orport_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + orport_socket = socket.socket(socket.AF_INET6 if is_ipv6 else socket.AF_INET, socket.SOCK_STREAM) + + try: orport_socket.connect((address, port)) - # ??? + except Exception as exc: + issues.append(Issue(Runlevel.WARNING, 'UNABLE_TO_REACH_ORPORT', authority = authority.nickname, address = address, port = port, error = exc, to = [authority])) + finally: + orport_socket.close() return issues @@ -799,9 +792,9 @@ def _get_documents(label, resource): median_time = sorted(times_taken.values())[len(times_taken) / 2] authority_times = ', '.join(['%s => %0.1fs' % (authority, time_taken) for authority, time_taken in times_taken.items()]) - for authority, time_taken in times_taken.items(): + for nickname, time_taken in times_taken.items(): if time_taken > median_time * 5: - issues.append(Issue(Runlevel.NOTICE, 'LATENCY', authority = authority, time_taken = '%0.1fs' % time_taken, median_time = '%0.1fs' % median_time, authority_times = authority_times, to = [authority])) + issues.append(Issue(Runlevel.NOTICE, 'LATENCY', authority = nickname, time_taken = '%0.1fs' % time_taken, median_time = '%0.1fs' % median_time, authority_times = authority_times, to = [nickname])) return documents, issues diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 6d72cac..5630207 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -19,6 +19,7 @@ msg TOR_OUT_OF_DATE => The following authorities are an out of date version of msg BADEXIT_OUT_OF_SYNC => Authorities disagree about the BadExit flag for {fingerprint} ({counts}) msg BANDWIDTH_AUTHORITIES_OUT_OF_SYNC => Bandwidth authorities have a substantially different number of measured entries: {authorities} msg AUTHORITY_UNAVAILABLE => Unable to retrieve the {fetch_type} from {authority} ({url}): {error} +msg UNABLE_TO_REACH_ORPORT => Unable to reach the ORPort of {authority} ({address}, port {port}): {error} # hours that we'll suppress messages if it hasn't changed

1 0

[tor/master] Fix indentation and quotation of the headers
by nickm＠torproject.org 27 May '16

27 May '16

commit c404905822b06ef60301fced40897872abeb7914 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri May 13 11:03:55 2016 +0000 Fix indentation and quotation of the headers --- configure.ac | 104 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/configure.ac b/configure.ac index 716e72a..e3a0dec 100644 --- a/configure.ac +++ b/configure.ac @@ -1004,59 +1004,57 @@ AC_SUBST(CURVE25519_LIBS) dnl Make sure to enable support for large off_t if available. AC_SYS_LARGEFILE -AC_CHECK_HEADERS( - assert.h \ - errno.h \ - fcntl.h \ - signal.h \ - string.h \ - sys/capability.h \ - sys/fcntl.h \ - sys/stat.h \ - sys/time.h \ - sys/types.h \ - time.h \ - unistd.h \ - arpa/inet.h \ - crt_externs.h \ - execinfo.h \ - grp.h \ - ifaddrs.h \ - inttypes.h \ - limits.h \ - linux/types.h \ - machine/limits.h \ - malloc.h \ - malloc/malloc.h \ - malloc_np.h \ - netdb.h \ - netinet/in.h \ - netinet/in6.h \ - pwd.h \ - readpassphrase.h \ - stdint.h \ - sys/eventfd.h \ - sys/file.h \ - sys/ioctl.h \ - sys/limits.h \ - sys/mman.h \ - sys/param.h \ - sys/prctl.h \ - sys/resource.h \ - sys/select.h \ - sys/socket.h \ - sys/statvfs.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/syslimits.h \ - sys/time.h \ - sys/types.h \ - sys/un.h \ - sys/utime.h \ - sys/wait.h \ - syslog.h \ - utime.h -) +AC_CHECK_HEADERS([assert.h \ + errno.h \ + fcntl.h \ + signal.h \ + string.h \ + sys/capability.h \ + sys/fcntl.h \ + sys/stat.h \ + sys/time.h \ + sys/types.h \ + time.h \ + unistd.h \ + arpa/inet.h \ + crt_externs.h \ + execinfo.h \ + grp.h \ + ifaddrs.h \ + inttypes.h \ + limits.h \ + linux/types.h \ + machine/limits.h \ + malloc.h \ + malloc/malloc.h \ + malloc_np.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + pwd.h \ + readpassphrase.h \ + stdint.h \ + sys/eventfd.h \ + sys/file.h \ + sys/ioctl.h \ + sys/limits.h \ + sys/mman.h \ + sys/param.h \ + sys/prctl.h \ + sys/resource.h \ + sys/select.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/syscall.h \ + sys/sysctl.h \ + sys/syslimits.h \ + sys/time.h \ + sys/types.h \ + sys/un.h \ + sys/utime.h \ + sys/wait.h \ + syslog.h \ + utime.h]) AC_CHECK_HEADERS(sys/param.h)

1 0

[tor/master] Do not warn on missing headers
by nickm＠torproject.org 27 May '16

27 May '16

commit ab8f1a9e9b4120fe30bfe44d66c121aef336f6a6 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed May 11 12:20:11 2016 +0000 Do not warn on missing headers --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 29715c1..716e72a 100644 --- a/configure.ac +++ b/configure.ac @@ -1016,12 +1016,7 @@ AC_CHECK_HEADERS( sys/time.h \ sys/types.h \ time.h \ - unistd.h - , , AC_MSG_WARN(Some headers were not found, compilation may fail. If compilation succeeds, please send your orconfig.h to the developers so we can fix this warning.)) - -dnl These headers are not essential - -AC_CHECK_HEADERS( + unistd.h \ arpa/inet.h \ crt_externs.h \ execinfo.h \

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 27 May '16

27 May '16

commit d68748bd80eeabb3794b33fdb0f85a3fa601a589 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 27 15:45:57 2016 +0000 Update translations for tails-iuk_completed --- pt_BR.po | 97 ++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 1a50b87..16c9166 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"POT-Creation-Date: 2016-05-25 16:55+0200\n" +"PO-Revision-Date: 2016-05-27 15:38+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -23,18 +23,18 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:522 -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524 +#: ../lib/Tails/IUK/Frontend.pm:697 msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" msgstr "Para informações sobre depuração, executar o seguinte comando: sudo tails-debugging-info" -#: ../lib/Tails/IUK/Frontend.pm:215 +#: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" msgstr "Erro ao verificar as atualizações" -#: ../lib/Tails/IUK/Frontend.pm:218 +#: ../lib/Tails/IUK/Frontend.pm:220 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -43,64 +43,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Não foi possível determinar se uma atualização está disponível em nosso website.\n\nVerifique sua conexão de rede e reinicie o Tails para tentar atualizar novamente.\n\nCaso o problema persista, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:233 +#: ../lib/Tails/IUK/Frontend.pm:235 msgid "no automatic upgrade is available from our website for this version" msgstr "No nosso website, nenhuma atualização automática para essa versão está disponível" -#: ../lib/Tails/IUK/Frontend.pm:239 +#: ../lib/Tails/IUK/Frontend.pm:241 msgid "your device was not created using Tails Installer" msgstr "seu dispositivo não foi criado usando o Instalador do Tails" -#: ../lib/Tails/IUK/Frontend.pm:244 +#: ../lib/Tails/IUK/Frontend.pm:246 msgid "Tails was started from a DVD or a read-only device" msgstr "O Tails foi inciado a partir de um DVD ou de um dispositivo somente de leitura" -#: ../lib/Tails/IUK/Frontend.pm:249 +#: ../lib/Tails/IUK/Frontend.pm:251 msgid "there is not enough free space on the Tails system partition" msgstr "não há espaço livre suficiente na partição do sistema do Tails" -#: ../lib/Tails/IUK/Frontend.pm:254 +#: ../lib/Tails/IUK/Frontend.pm:256 msgid "not enough memory is available on this system" msgstr "não há memória suficiente disponível nesse sistema" -#: ../lib/Tails/IUK/Frontend.pm:260 +#: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Nenhuma explicação disponível para o motivo '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:280 +#: ../lib/Tails/IUK/Frontend.pm:282 msgid "The system is up-to-date" msgstr "O sistema está atualizado" -#: ../lib/Tails/IUK/Frontend.pm:285 +#: ../lib/Tails/IUK/Frontend.pm:287 msgid "This version of Tails is outdated, and may have security issues." msgstr "Esta versão do Tails está desatualizada e pode ter problemas de segurança." -#: ../lib/Tails/IUK/Frontend.pm:317 +#: ../lib/Tails/IUK/Frontend.pm:319 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "A atualização incremental disponível requer %{space_needed}s de espaço livre na partição do sistema Tails, mas somente %{free_space}s está disponível." -#: ../lib/Tails/IUK/Frontend.pm:333 +#: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "A atualização incremental disponível requer %{memory_needed}s de espaço livre, mas somente %{free_memory}s está disponível." -#: ../lib/Tails/IUK/Frontend.pm:355 +#: ../lib/Tails/IUK/Frontend.pm:357 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Uma atualização incremental está disponível, mas a atualização completa não se encontra disponível. Isso não deve acontecer. Por favor, reporte o bug." -#: ../lib/Tails/IUK/Frontend.pm:359 +#: ../lib/Tails/IUK/Frontend.pm:361 msgid "Error while detecting available upgrades" msgstr "Erro ao detectar as atualizações disponíveis" -#: ../lib/Tails/IUK/Frontend.pm:369 +#: ../lib/Tails/IUK/Frontend.pm:371 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -116,19 +116,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Você deve atualizar para %{name}s %{version}s.\n\nPara mais informações sobre essa nova versão, veja %{details_url}s\n\nRecomendamos que você feche todas os programas durante a atualização.\nO download da atualização pode levar um bom tempo, de vários minutos a algumas horas.\nA rede será desabilitada após o download da atualização.\n\nTamanho do download: %{size}s\n\nVocê deseja fazer a atualizar agora?" -#: ../lib/Tails/IUK/Frontend.pm:384 +#: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" msgstr "Atualização disponível" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade now" msgstr "Atualizar agora" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:388 msgid "Upgrade later" msgstr "Atualizar mais tarde" -#: ../lib/Tails/IUK/Frontend.pm:394 +#: ../lib/Tails/IUK/Frontend.pm:396 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -140,20 +140,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Você deve atualizar manualmente para %{name}s %{version}s.\n\nPara mais informações sobre esta nova versão, consulte %{details_url}s.\n\nNão é possível atualizar automaticamente o seu dispositivo para esta nova versão: %{explanation}s.\n\nPara saber como realizar uma atualização manual, consulte https://tails.boum.org/doc/first_steps/upgrade/index.pt.html#manual" -#: ../lib/Tails/IUK/Frontend.pm:410 +#: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" msgstr "Nova versão disponível" -#: ../lib/Tails/IUK/Frontend.pm:467 +#: ../lib/Tails/IUK/Frontend.pm:469 msgid "Downloading upgrade" msgstr "Fazendo download da atualização" -#: ../lib/Tails/IUK/Frontend.pm:470 +#: ../lib/Tails/IUK/Frontend.pm:472 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Fazendo download da atualização para %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:511 +#: ../lib/Tails/IUK/Frontend.pm:513 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -161,26 +161,37 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "O download da atualização não pôde ser feito.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:527 ../lib/Tails/IUK/Frontend.pm:546 +#: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while downloading the upgrade" msgstr "Erro ao fazer o download das atualizações" -#: ../lib/Tails/IUK/Frontend.pm:539 +#: ../lib/Tails/IUK/Frontend.pm:541 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "O arquivo extraído '%{output_file}s' não existe, mas o tails-iuk-get-target-file não reclamou. Por favor, reporte o bug." -#: ../lib/Tails/IUK/Frontend.pm:558 +#: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" msgstr "Erro ao criar um diretório temporário de download" -#: ../lib/Tails/IUK/Frontend.pm:561 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" msgstr "Falha ao criar um diretório temporário de download" -#: ../lib/Tails/IUK/Frontend.pm:573 +#: ../lib/Tails/IUK/Frontend.pm:587 +msgid "" +"Could not choose a download server.\n" +"\n" +"This should not happen. Please report a bug." +msgstr "Impossível encontrar um servidor para fazer download.\n\nIsso não deveria acontecer. Por favor, relate um bug." + +#: ../lib/Tails/IUK/Frontend.pm:591 +msgid "Error while choosing a download server" +msgstr "Erro ao escolher um servidor para fazer download" + +#: ../lib/Tails/IUK/Frontend.pm:608 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -190,46 +201,46 @@ msgid "" "Do you want to restart now?" msgstr "Seu dispositivo Tails foi atualizado com sucesso.\n\nAlgumas funcionalidades de segurança foram desabilitadas temporariamente.\nVocê deve reiniciar o Tails em sua nova versão assim que puder.\n\nVocê deseja reiniciar agora?" -#: ../lib/Tails/IUK/Frontend.pm:578 +#: ../lib/Tails/IUK/Frontend.pm:613 msgid "Restart Tails" msgstr "Reiniciar o Tails" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Restart now" msgstr "Reiniciar agora" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:615 msgid "Restart later" msgstr "Reiniciar mais tarde" -#: ../lib/Tails/IUK/Frontend.pm:591 +#: ../lib/Tails/IUK/Frontend.pm:626 msgid "Error while restarting the system" msgstr "Erro ao reiniciar o sistema" -#: ../lib/Tails/IUK/Frontend.pm:594 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "Failed to restart the system" msgstr "Falha em reiniciar o sistema" -#: ../lib/Tails/IUK/Frontend.pm:609 +#: ../lib/Tails/IUK/Frontend.pm:644 msgid "Error while shutting down the network" msgstr "Erro ao encerrar a rede" -#: ../lib/Tails/IUK/Frontend.pm:612 +#: ../lib/Tails/IUK/Frontend.pm:647 msgid "Failed to shutdown network" msgstr "Falha ao encerrar a rede" -#: ../lib/Tails/IUK/Frontend.pm:622 +#: ../lib/Tails/IUK/Frontend.pm:657 msgid "Upgrading the system" msgstr "Atualizando o sistema" -#: ../lib/Tails/IUK/Frontend.pm:624 +#: ../lib/Tails/IUK/Frontend.pm:659 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr " O seu dispositivo Tails está sendo atualizado...\n\nPor razões de segurança, agora, a rede está desabilitada." -#: ../lib/Tails/IUK/Frontend.pm:657 +#: ../lib/Tails/IUK/Frontend.pm:692 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -237,6 +248,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Ocorreu um erro ao instalar a atualização.\\n\\nSeu dispositivo Tails precisa ser reparado e talvez não possa reiniciar.\\n\\nPor favor, siga as instruções no arquivo:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:702 msgid "Error while installing the upgrade" msgstr "Erro ao instalar a atualização"

1 0