tor-commits

tor-commits@lists.torproject.org

October 2018

17 participants
2351 discussions

[tor/master] Merge branch 'bug27849_redux'
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 56a3cef4d73922a687fa4256938b5c459aada42c Merge: 698629f5a b5731cdf2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 17:33:58 2018 -0400 Merge branch 'bug27849_redux' changes/ticket27849 | 5 +++++ src/core/mainloop/mainloop.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/core/mainloop/mainloop.c index 6c305c2b4,000000000..0f3fbbcce mode 100644,000000..100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@@ -1,2929 -1,0 +1,2934 @@@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file mainloop.c + * \brief Toplevel module. Handles signals, multiplexes between + * connections, implements main loop, and drives scheduled events. + * + * For the main loop itself; see run_main_loop_once(). It invokes the rest of + * Tor mostly through Libevent callbacks. Libevent callbacks can happen when + * a timer elapses, a signal is received, a socket is ready to read or write, + * or an event is manually activated. + * + * Most events in Tor are driven from these callbacks: + * <ul> + * <li>conn_read_callback() and conn_write_callback() here, which are + * invoked when a socket is ready to read or write respectively. + * <li>signal_callback(), which handles incoming signals. + * </ul> + * Other events are used for specific purposes, or for building more complex + * control structures. If you search for usage of tor_libevent_new(), you + * will find all the events that we construct in Tor. + * + * Tor has numerous housekeeping operations that need to happen + * regularly. They are handled in different ways: + * <ul> + * <li>The most frequent operations are handled after every read or write + * event, at the end of connection_handle_read() and + * connection_handle_write(). + * + * <li>The next most frequent operations happen after each invocation of the + * main loop, in run_main_loop_once(). + * + * <li>Once per second, we run all of the operations listed in + * second_elapsed_callback(), and in its child, run_scheduled_events(). + * + * <li>Once-a-second operations are handled in second_elapsed_callback(). + * + * <li>More infrequent operations take place based on the periodic event + * driver in periodic.c . These are stored in the periodic_events[] + * table. + * </ul> + * + **/ + +#define MAINLOOP_PRIVATE +#include "core/or/or.h" + +#include "app/config/config.h" +#include "app/config/statefile.h" +#include "app/main/ntmain.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/cpuworker.h" +#include "core/mainloop/mainloop.h" +#include "core/mainloop/netstatus.h" +#include "core/mainloop/periodic.h" +#include "core/or/channel.h" +#include "core/or/channelpadding.h" +#include "core/or/channeltls.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/connection_edge.h" +#include "core/or/connection_or.h" +#include "core/or/dos.h" +#include "core/or/status.h" +#include "feature/client/addressmap.h" +#include "feature/client/bridges.h" +#include "feature/client/dnsserv.h" +#include "feature/client/entrynodes.h" +#include "feature/client/transports.h" +#include "feature/control/control.h" +#include "feature/dirauth/authmode.h" +#include "feature/dirauth/reachability.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/dircache/dirserv.h" +#include "feature/dircommon/directory.h" +#include "feature/hibernate/hibernate.h" +#include "feature/hs/hs_cache.h" +#include "feature/hs/hs_client.h" +#include "feature/hs/hs_service.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" +#include "feature/relay/dns.h" +#include "feature/relay/routerkeys.h" +#include "feature/relay/routermode.h" +#include "feature/relay/selftest.h" +#include "feature/rend/rendcache.h" +#include "feature/rend/rendservice.h" +#include "feature/stats/geoip_stats.h" +#include "feature/stats/predict_ports.h" +#include "feature/stats/rephist.h" +#include "lib/container/buffers.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/err/backtrace.h" +#include "lib/tls/buffers_tls.h" + +#include "lib/net/buffers_net.h" +#include "lib/evloop/compat_libevent.h" + +#include <event2/event.h> + +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/authmode.h" + +#include "core/or/cell_st.h" +#include "core/or/entry_connection_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_connection_st.h" +#include "app/config/or_state_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "core/or/socks_request_st.h" + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#ifdef HAVE_SYSTEMD +# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) +/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse + * Coverity. Here's a kludge to unconfuse it. + */ +# define __INCLUDE_LEVEL__ 2 +#endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */ +#include <systemd/sd-daemon.h> +#endif /* defined(HAVE_SYSTEMD) */ + +/* Token bucket for all traffic. */ +token_bucket_rw_t global_bucket; + +/* Token bucket for relayed traffic. */ +token_bucket_rw_t global_relayed_bucket; + +/* XXX we might want to keep stats about global_relayed_*_bucket too. Or not.*/ +/** How many bytes have we read since we started the process? */ +static uint64_t stats_n_bytes_read = 0; +/** How many bytes have we written since we started the process? */ +static uint64_t stats_n_bytes_written = 0; +/** What time did this process start up? */ +time_t time_of_process_start = 0; +/** How many seconds have we been running? */ +static long stats_n_seconds_working = 0; +/** How many times have we returned from the main loop successfully? */ +static uint64_t stats_n_main_loop_successes = 0; +/** How many times have we received an error from the main loop? */ +static uint64_t stats_n_main_loop_errors = 0; +/** How many times have we returned from the main loop with no events. */ +static uint64_t stats_n_main_loop_idle = 0; + +/** How often will we honor SIGNEWNYM requests? */ +#define MAX_SIGNEWNYM_RATE 10 +/** When did we last process a SIGNEWNYM request? */ +static time_t time_of_last_signewnym = 0; +/** Is there a signewnym request we're currently waiting to handle? */ +static int signewnym_is_pending = 0; +/** Mainloop event for the deferred signewnym call. */ +static mainloop_event_t *handle_deferred_signewnym_ev = NULL; +/** How many times have we called newnym? */ +static unsigned newnym_epoch = 0; + +/** Smartlist of all open connections. */ +STATIC smartlist_t *connection_array = NULL; +/** List of connections that have been marked for close and need to be freed + * and removed from connection_array. */ +static smartlist_t *closeable_connection_lst = NULL; +/** List of linked connections that are currently reading data into their + * inbuf from their partner's outbuf. */ +static smartlist_t *active_linked_connection_lst = NULL; +/** Flag: Set to true iff we entered the current libevent main loop via + * loop_once. If so, there's no need to trigger a loopexit in order + * to handle linked connections. */ +static int called_loop_once = 0; +/** Flag: if true, it's time to shut down, so the main loop should exit as + * soon as possible. + */ +static int main_loop_should_exit = 0; +/** The return value that the main loop should yield when it exits, if + * main_loop_should_exit is true. + */ +static int main_loop_exit_value = 0; + +/** We set this to 1 when we've opened a circuit, so we can print a log + * entry to inform the user that Tor is working. We set it to 0 when + * we think the fact that we once opened a circuit doesn't mean we can do so + * any longer (a big time jump happened, when we notice our directory is + * heinously out-of-date, etc. + */ +static int can_complete_circuits = 0; + +/** How often do we check for router descriptors that we should download + * when we have too little directory info? */ +#define GREEDY_DESCRIPTOR_RETRY_INTERVAL (10) +/** How often do we check for router descriptors that we should download + * when we have enough directory info? */ +#define LAZY_DESCRIPTOR_RETRY_INTERVAL (60) + +static int conn_close_if_marked(int i); +static int run_main_loop_until_done(void); +static void connection_start_reading_from_linked_conn(connection_t *conn); +static int connection_should_read_from_linked_conn(connection_t *conn); +static void conn_read_callback(evutil_socket_t fd, short event, void *_conn); +static void conn_write_callback(evutil_socket_t fd, short event, void *_conn); +static void second_elapsed_callback(periodic_timer_t *timer, void *args); +static void shutdown_did_not_work_callback(evutil_socket_t fd, short event, + void *arg) ATTR_NORETURN; + +/**************************************************************************** + * + * This section contains accessors and other methods on the connection_array + * variables (which are global within this file and unavailable outside it). + * + ****************************************************************************/ + +/** Return 1 if we have successfully built a circuit, and nothing has changed + * to make us think that maybe we can't. + */ +int +have_completed_a_circuit(void) +{ + return can_complete_circuits; +} + +/** Note that we have successfully built a circuit, so that reachability + * testing and introduction points and so on may be attempted. */ +void +note_that_we_completed_a_circuit(void) +{ + can_complete_circuits = 1; +} + +/** Note that something has happened (like a clock jump, or DisableNetwork) to + * make us think that maybe we can't complete circuits. */ +void +note_that_we_maybe_cant_complete_circuits(void) +{ + can_complete_circuits = 0; +} + +/** Add conn to the array of connections that we can poll on. The + * connection's socket must be set; the connection starts out + * non-reading and non-writing. + */ +int +connection_add_impl(connection_t *conn, int is_connecting) +{ + tor_assert(conn); + tor_assert(SOCKET_OK(conn->s) || + conn->linked || + (conn->type == CONN_TYPE_AP && + TO_EDGE_CONN(conn)->is_dns_request)); + + tor_assert(conn->conn_array_index == -1); /* can only connection_add once */ + conn->conn_array_index = smartlist_len(connection_array); + smartlist_add(connection_array, conn); + + (void) is_connecting; + + if (SOCKET_OK(conn->s) || conn->linked) { + conn->read_event = tor_event_new(tor_libevent_get_base(), + conn->s, EV_READ|EV_PERSIST, conn_read_callback, conn); + conn->write_event = tor_event_new(tor_libevent_get_base(), + conn->s, EV_WRITE|EV_PERSIST, conn_write_callback, conn); + /* XXXX CHECK FOR NULL RETURN! */ + } + + log_debug(LD_NET,"new conn type %s, socket %d, address %s, n_conns %d.", + conn_type_to_string(conn->type), (int)conn->s, conn->address, + smartlist_len(connection_array)); + + return 0; +} + +/** Tell libevent that we don't care about conn any more. */ +void +connection_unregister_events(connection_t *conn) +{ + if (conn->read_event) { + if (event_del(conn->read_event)) + log_warn(LD_BUG, "Error removing read event for %d", (int)conn->s); + tor_free(conn->read_event); + } + if (conn->write_event) { + if (event_del(conn->write_event)) + log_warn(LD_BUG, "Error removing write event for %d", (int)conn->s); + tor_free(conn->write_event); + } + if (conn->type == CONN_TYPE_AP_DNS_LISTENER) { + dnsserv_close_listener(conn); + } +} + +/** Remove the connection from the global list, and remove the + * corresponding poll entry. Calling this function will shift the last + * connection (if any) into the position occupied by conn. + */ +int +connection_remove(connection_t *conn) +{ + int current_index; + connection_t *tmp; + + tor_assert(conn); + + log_debug(LD_NET,"removing socket %d (type %s), n_conns now %d", + (int)conn->s, conn_type_to_string(conn->type), + smartlist_len(connection_array)); + + if (conn->type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + log_info(LD_NET, "Closing SOCKS Unix socket connection"); + } + + control_event_conn_bandwidth(conn); + + tor_assert(conn->conn_array_index >= 0); + current_index = conn->conn_array_index; + connection_unregister_events(conn); /* This is redundant, but cheap. */ + if (current_index == smartlist_len(connection_array)-1) { /* at the end */ + smartlist_del(connection_array, current_index); + return 0; + } + + /* replace this one with the one at the end */ + smartlist_del(connection_array, current_index); + tmp = smartlist_get(connection_array, current_index); + tmp->conn_array_index = current_index; + + return 0; +} + +/** If conn is an edge conn, remove it from the list + * of conn's on this circuit. If it's not on an edge, + * flush and send destroys for all circuits on this conn. + * + * Remove it from connection_array (if applicable) and + * from closeable_connection_list. + * + * Then free it. + */ +static void +connection_unlink(connection_t *conn) +{ + connection_about_to_close_connection(conn); + if (conn->conn_array_index >= 0) { + connection_remove(conn); + } + if (conn->linked_conn) { + conn->linked_conn->linked_conn = NULL; + if (! conn->linked_conn->marked_for_close && + conn->linked_conn->reading_from_linked_conn) + connection_start_reading(conn->linked_conn); + conn->linked_conn = NULL; + } + smartlist_remove(closeable_connection_lst, conn); + smartlist_remove(active_linked_connection_lst, conn); + if (conn->type == CONN_TYPE_EXIT) { + assert_connection_edge_not_dns_pending(TO_EDGE_CONN(conn)); + } + if (conn->type == CONN_TYPE_OR) { + if (!tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest)) + connection_or_clear_identity(TO_OR_CONN(conn)); + /* connection_unlink() can only get called if the connection + * was already on the closeable list, and it got there by + * connection_mark_for_close(), which was called from + * connection_or_close_normally() or + * connection_or_close_for_error(), so the channel should + * already be in CHANNEL_STATE_CLOSING, and then the + * connection_about_to_close_connection() goes to + * connection_or_about_to_close(), which calls channel_closed() + * to notify the channel_t layer, and closed the channel, so + * nothing more to do here to deal with the channel associated + * with an orconn. + */ + } + connection_free(conn); +} + +/** + * Callback: used to activate read events for all linked connections, so + * libevent knows to call their read callbacks. This callback run as a + * postloop event, so that the events _it_ activates don't happen until + * Libevent has a chance to check for other events. + */ +static void +schedule_active_linked_connections_cb(mainloop_event_t *event, void *arg) +{ + (void)event; + (void)arg; + + /* All active linked conns should get their read events activated, + * so that libevent knows to run their callbacks. */ + SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn, + event_active(conn->read_event, EV_READ, 1)); +} + +/** Event that invokes schedule_active_linked_connections_cb. */ +static mainloop_event_t *schedule_active_linked_connections_event = NULL; + +/** Initialize the global connection list, closeable connection list, + * and active connection list. */ +void +tor_init_connection_lists(void) +{ + if (!connection_array) + connection_array = smartlist_new(); + if (!closeable_connection_lst) + closeable_connection_lst = smartlist_new(); + if (!active_linked_connection_lst) + active_linked_connection_lst = smartlist_new(); +} + +/** Schedule conn to be closed. **/ +void +add_connection_to_closeable_list(connection_t *conn) +{ + tor_assert(!smartlist_contains(closeable_connection_lst, conn)); + tor_assert(conn->marked_for_close); + assert_connection_ok(conn, time(NULL)); + smartlist_add(closeable_connection_lst, conn); + mainloop_schedule_postloop_cleanup(); +} + +/** Return 1 if conn is on the closeable list, else return 0. */ +int +connection_is_on_closeable_list(connection_t *conn) +{ + return smartlist_contains(closeable_connection_lst, conn); +} + +/** Return true iff conn is in the current poll array. */ +int +connection_in_array(connection_t *conn) +{ + return smartlist_contains(connection_array, conn); +} + +/** Set *array to an array of all connections. *array must not + * be modified. + */ +MOCK_IMPL(smartlist_t *, +get_connection_array, (void)) +{ + if (!connection_array) + connection_array = smartlist_new(); + return connection_array; +} + +/** + * Return the amount of network traffic read, in bytes, over the life of this + * process. + */ +MOCK_IMPL(uint64_t, +get_bytes_read,(void)) +{ + return stats_n_bytes_read; +} + +/** + * Return the amount of network traffic read, in bytes, over the life of this + * process. + */ +MOCK_IMPL(uint64_t, +get_bytes_written,(void)) +{ + return stats_n_bytes_written; +} + +/** + * Increment the amount of network traffic read and written, over the life of + * this process. + */ +void +stats_increment_bytes_read_and_written(uint64_t r, uint64_t w) +{ + stats_n_bytes_read += r; + stats_n_bytes_written += w; +} + +/** Set the event mask on conn to events. (The event + * mask is a bitmask whose bits are READ_EVENT and WRITE_EVENT) + */ +void +connection_watch_events(connection_t *conn, watchable_events_t events) +{ + if (events & READ_EVENT) + connection_start_reading(conn); + else + connection_stop_reading(conn); + + if (events & WRITE_EVENT) + connection_start_writing(conn); + else + connection_stop_writing(conn); +} + +/** Return true iff conn is listening for read events. */ +int +connection_is_reading(connection_t *conn) +{ + tor_assert(conn); + + return conn->reading_from_linked_conn || + (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); +} + +/** Reset our main loop counters. */ +void +reset_main_loop_counters(void) +{ + stats_n_main_loop_successes = 0; + stats_n_main_loop_errors = 0; + stats_n_main_loop_idle = 0; +} + +/** Increment the main loop success counter. */ +static void +increment_main_loop_success_count(void) +{ + ++stats_n_main_loop_successes; +} + +/** Get the main loop success counter. */ +uint64_t +get_main_loop_success_count(void) +{ + return stats_n_main_loop_successes; +} + +/** Increment the main loop error counter. */ +static void +increment_main_loop_error_count(void) +{ + ++stats_n_main_loop_errors; +} + +/** Get the main loop error counter. */ +uint64_t +get_main_loop_error_count(void) +{ + return stats_n_main_loop_errors; +} + +/** Increment the main loop idle counter. */ +static void +increment_main_loop_idle_count(void) +{ + ++stats_n_main_loop_idle; +} + +/** Get the main loop idle counter. */ +uint64_t +get_main_loop_idle_count(void) +{ + return stats_n_main_loop_idle; +} + +/** Check whether conn is correct in having (or not having) a + * read/write event (passed in ev). On success, return 0. On failure, + * log a warning and return -1. */ +static int +connection_check_event(connection_t *conn, struct event *ev) +{ + int bad; + + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + /* DNS requests which we launch through the dnsserv.c module do not have + * any underlying socket or any underlying linked connection, so they + * shouldn't have any attached events either. + */ + bad = ev != NULL; + } else { + /* Everything else should have an underlying socket, or a linked + * connection (which is also tracked with a read_event/write_event pair). + */ + bad = ev == NULL; + } + + if (bad) { + log_warn(LD_BUG, "Event missing on connection %p [%s;%s]. " + "socket=%d. linked=%d. " + "is_dns_request=%d. Marked_for_close=%s:%d", + conn, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state), + (int)conn->s, (int)conn->linked, + (conn->type == CONN_TYPE_AP && + TO_EDGE_CONN(conn)->is_dns_request), + conn->marked_for_close_file ? conn->marked_for_close_file : "-", + conn->marked_for_close + ); + log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + return -1; + } + return 0; +} + +/** Tell the main loop to stop notifying conn of any read events. */ +MOCK_IMPL(void, +connection_stop_reading,(connection_t *conn)) +{ + tor_assert(conn); + + if (connection_check_event(conn, conn->read_event) < 0) { + return; + } + + if (conn->linked) { + conn->reading_from_linked_conn = 0; + connection_stop_reading_from_linked_conn(conn); + } else { + if (event_del(conn->read_event)) + log_warn(LD_NET, "Error from libevent setting read event state for %d " + "to unwatched: %s", + (int)conn->s, + tor_socket_strerror(tor_socket_errno(conn->s))); + } +} + +/** Tell the main loop to start notifying conn of any read events. */ +MOCK_IMPL(void, +connection_start_reading,(connection_t *conn)) +{ + tor_assert(conn); + + if (connection_check_event(conn, conn->read_event) < 0) { + return; + } + + if (conn->linked) { + conn->reading_from_linked_conn = 1; + if (connection_should_read_from_linked_conn(conn)) + connection_start_reading_from_linked_conn(conn); + } else { + if (event_add(conn->read_event, NULL)) + log_warn(LD_NET, "Error from libevent setting read event state for %d " + "to watched: %s", + (int)conn->s, + tor_socket_strerror(tor_socket_errno(conn->s))); + } +} + +/** Return true iff conn is listening for write events. */ +int +connection_is_writing(connection_t *conn) +{ + tor_assert(conn); + + return conn->writing_to_linked_conn || + (conn->write_event && event_pending(conn->write_event, EV_WRITE, NULL)); +} + +/** Tell the main loop to stop notifying conn of any write events. */ +MOCK_IMPL(void, +connection_stop_writing,(connection_t *conn)) +{ + tor_assert(conn); + + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } + + if (conn->linked) { + conn->writing_to_linked_conn = 0; + if (conn->linked_conn) + connection_stop_reading_from_linked_conn(conn->linked_conn); + } else { + if (event_del(conn->write_event)) + log_warn(LD_NET, "Error from libevent setting write event state for %d " + "to unwatched: %s", + (int)conn->s, + tor_socket_strerror(tor_socket_errno(conn->s))); + } +} + +/** Tell the main loop to start notifying conn of any write events. */ +MOCK_IMPL(void, +connection_start_writing,(connection_t *conn)) +{ + tor_assert(conn); + + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } + + if (conn->linked) { + conn->writing_to_linked_conn = 1; + if (conn->linked_conn && + connection_should_read_from_linked_conn(conn->linked_conn)) + connection_start_reading_from_linked_conn(conn->linked_conn); + } else { + if (event_add(conn->write_event, NULL)) + log_warn(LD_NET, "Error from libevent setting write event state for %d " + "to watched: %s", + (int)conn->s, + tor_socket_strerror(tor_socket_errno(conn->s))); + } +} + +/** Return true iff conn is linked conn, and reading from the conn + * linked to it would be good and feasible. (Reading is "feasible" if the + * other conn exists and has data in its outbuf, and is "good" if we have our + * reading_from_linked_conn flag set and the other conn has its + * writing_to_linked_conn flag set.)*/ +static int +connection_should_read_from_linked_conn(connection_t *conn) +{ + if (conn->linked && conn->reading_from_linked_conn) { + if (! conn->linked_conn || + (conn->linked_conn->writing_to_linked_conn && + buf_datalen(conn->linked_conn->outbuf))) + return 1; + } + return 0; +} + +/** Event to run 'shutdown did not work callback'. */ +static struct event *shutdown_did_not_work_event = NULL; + +/** Failsafe measure that should never actually be necessary: If + * tor_shutdown_event_loop_and_exit() somehow doesn't successfully exit the + * event loop, then this callback will kill Tor with an assertion failure + * seconds later + */ +static void +shutdown_did_not_work_callback(evutil_socket_t fd, short event, void *arg) +{ + // LCOV_EXCL_START + (void) fd; + (void) event; + (void) arg; + tor_assert_unreached(); + // LCOV_EXCL_STOP +} + +#ifdef ENABLE_RESTART_DEBUGGING +static struct event *tor_shutdown_event_loop_for_restart_event = NULL; +static void +tor_shutdown_event_loop_for_restart_cb( + evutil_socket_t fd, short event, void *arg) +{ + (void)fd; + (void)event; + (void)arg; + tor_event_free(tor_shutdown_event_loop_for_restart_event); + tor_shutdown_event_loop_and_exit(0); +} +#endif + +/** + * After finishing the current callback (if any), shut down the main loop, + * clean up the process, and exit with exitcode. + */ +void +tor_shutdown_event_loop_and_exit(int exitcode) +{ + if (main_loop_should_exit) + return; /* Ignore multiple calls to this function. */ + + main_loop_should_exit = 1; + main_loop_exit_value = exitcode; + + /* Die with an assertion failure in ten seconds, if for some reason we don't + * exit normally. */ + /* XXXX We should consider this code if it's never used. */ + struct timeval ten_seconds = { 10, 0 }; + shutdown_did_not_work_event = tor_evtimer_new( + tor_libevent_get_base(), + shutdown_did_not_work_callback, NULL); + event_add(shutdown_did_not_work_event, &ten_seconds); + + /* Unlike exit_loop_after_delay(), exit_loop_after_callback + * prevents other callbacks from running. */ + tor_libevent_exit_loop_after_callback(tor_libevent_get_base()); +} + +/** Return true iff tor_shutdown_event_loop_and_exit() has been called. */ +int +tor_event_loop_shutdown_is_pending(void) +{ + return main_loop_should_exit; +} + +/** Helper: Tell the main loop to begin reading bytes into conn from + * its linked connection, if it is not doing so already. Called by + * connection_start_reading and connection_start_writing as appropriate. */ +static void +connection_start_reading_from_linked_conn(connection_t *conn) +{ + tor_assert(conn); + tor_assert(conn->linked == 1); + + if (!conn->active_on_link) { + conn->active_on_link = 1; + smartlist_add(active_linked_connection_lst, conn); + mainloop_event_activate(schedule_active_linked_connections_event); + } else { + tor_assert(smartlist_contains(active_linked_connection_lst, conn)); + } +} + +/** Tell the main loop to stop reading bytes into conn from its linked + * connection, if is currently doing so. Called by connection_stop_reading, + * connection_stop_writing, and connection_read. */ +void +connection_stop_reading_from_linked_conn(connection_t *conn) +{ + tor_assert(conn); + tor_assert(conn->linked == 1); + + if (conn->active_on_link) { + conn->active_on_link = 0; + /* FFFF We could keep an index here so we can smartlist_del + * cleanly. On the other hand, this doesn't show up on profiles, + * so let's leave it alone for now. */ + smartlist_remove(active_linked_connection_lst, conn); + } else { + tor_assert(!smartlist_contains(active_linked_connection_lst, conn)); + } +} + +/** Close all connections that have been scheduled to get closed. */ +STATIC void +close_closeable_connections(void) +{ + int i; + for (i = 0; i < smartlist_len(closeable_connection_lst); ) { + connection_t *conn = smartlist_get(closeable_connection_lst, i); + if (conn->conn_array_index < 0) { + connection_unlink(conn); /* blow it away right now */ + } else { + if (!conn_close_if_marked(conn->conn_array_index)) + ++i; + } + } +} + +/** Count moribund connections for the OOS handler */ +MOCK_IMPL(int, +connection_count_moribund, (void)) +{ + int moribund = 0; + + /* + * Count things we'll try to kill when close_closeable_connections() + * runs next. + */ + SMARTLIST_FOREACH_BEGIN(closeable_connection_lst, connection_t *, conn) { + if (SOCKET_OK(conn->s) && connection_is_moribund(conn)) ++moribund; + } SMARTLIST_FOREACH_END(conn); + + return moribund; +} + +/** Libevent callback: this gets invoked when (connection_t*)conn has + * some data to read. */ +static void +conn_read_callback(evutil_socket_t fd, short event, void *_conn) +{ + connection_t *conn = _conn; + (void)fd; + (void)event; + + log_debug(LD_NET,"socket %d wants to read.",(int)conn->s); + + /* assert_connection_ok(conn, time(NULL)); */ + + if (connection_handle_read(conn) < 0) { + if (!conn->marked_for_close) { +#ifndef _WIN32 + log_warn(LD_BUG,"Unhandled error on read for %s connection " + "(fd %d); removing", + conn_type_to_string(conn->type), (int)conn->s); + tor_fragile_assert(); +#endif /* !defined(_WIN32) */ + if (CONN_IS_EDGE(conn)) + connection_edge_end_errno(TO_EDGE_CONN(conn)); + connection_mark_for_close(conn); + } + } + assert_connection_ok(conn, time(NULL)); + + if (smartlist_len(closeable_connection_lst)) + close_closeable_connections(); +} + +/** Libevent callback: this gets invoked when (connection_t*)conn has + * some data to write. */ +static void +conn_write_callback(evutil_socket_t fd, short events, void *_conn) +{ + connection_t *conn = _conn; + (void)fd; + (void)events; + + LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "socket %d wants to write.", + (int)conn->s)); + + /* assert_connection_ok(conn, time(NULL)); */ + + if (connection_handle_write(conn, 0) < 0) { + if (!conn->marked_for_close) { + /* this connection is broken. remove it. */ + log_fn(LOG_WARN,LD_BUG, + "unhandled error on write for %s connection (fd %d); removing", + conn_type_to_string(conn->type), (int)conn->s); + tor_fragile_assert(); + if (CONN_IS_EDGE(conn)) { + /* otherwise we cry wolf about duplicate close */ + edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + if (!edge_conn->end_reason) + edge_conn->end_reason = END_STREAM_REASON_INTERNAL; + edge_conn->edge_has_sent_end = 1; + } + connection_close_immediate(conn); /* So we don't try to flush. */ + connection_mark_for_close(conn); + } + } + assert_connection_ok(conn, time(NULL)); + + if (smartlist_len(closeable_connection_lst)) + close_closeable_connections(); +} + +/** If the connection at connection_array[i] is marked for close, then: + * - If it has data that it wants to flush, try to flush it. + * - If it _still_ has data to flush, and conn->hold_open_until_flushed is + * true, then leave the connection open and return. + * - Otherwise, remove the connection from connection_array and from + * all other lists, close it, and free it. + * Returns 1 if the connection was closed, 0 otherwise. + */ +static int +conn_close_if_marked(int i) +{ + connection_t *conn; + int retval; + time_t now; + + conn = smartlist_get(connection_array, i); + if (!conn->marked_for_close) + return 0; /* nothing to see here, move along */ + now = time(NULL); + assert_connection_ok(conn, now); + /* assert_all_pending_dns_resolves_ok(); */ + + log_debug(LD_NET,"Cleaning up connection (fd "TOR_SOCKET_T_FORMAT").", + conn->s); + + /* If the connection we are about to close was trying to connect to + a proxy server and failed, the client won't be able to use that + proxy. We should warn the user about this. */ + if (conn->proxy_state == PROXY_INFANT) + log_failed_proxy_connection(conn); + + if ((SOCKET_OK(conn->s) || conn->linked_conn) && + connection_wants_to_flush(conn)) { + /* s == -1 means it's an incomplete edge connection, or that the socket + * has already been closed as unflushable. */ + ssize_t sz = connection_bucket_write_limit(conn, now); + if (!conn->hold_open_until_flushed) + log_info(LD_NET, + "Conn (addr %s, fd %d, type %s, state %d) marked, but wants " + "to flush %d bytes. (Marked at %s:%d)", + escaped_safe_str_client(conn->address), + (int)conn->s, conn_type_to_string(conn->type), conn->state, + (int)conn->outbuf_flushlen, + conn->marked_for_close_file, conn->marked_for_close); + if (conn->linked_conn) { + retval = buf_move_to_buf(conn->linked_conn->inbuf, conn->outbuf, + &conn->outbuf_flushlen); + if (retval >= 0) { + /* The linked conn will notice that it has data when it notices that + * we're gone. */ + connection_start_reading_from_linked_conn(conn->linked_conn); + } + log_debug(LD_GENERAL, "Flushed last %d bytes from a linked conn; " + "%d left; flushlen %d; wants-to-flush==%d", retval, + (int)connection_get_outbuf_len(conn), + (int)conn->outbuf_flushlen, + connection_wants_to_flush(conn)); + } else if (connection_speaks_cells(conn)) { + if (conn->state == OR_CONN_STATE_OPEN) { + retval = buf_flush_to_tls(conn->outbuf, TO_OR_CONN(conn)->tls, sz, + &conn->outbuf_flushlen); + } else + retval = -1; /* never flush non-open broken tls connections */ + } else { + retval = buf_flush_to_socket(conn->outbuf, conn->s, sz, + &conn->outbuf_flushlen); + } + if (retval >= 0 && /* Technically, we could survive things like + TLS_WANT_WRITE here. But don't bother for now. */ + conn->hold_open_until_flushed && connection_wants_to_flush(conn)) { + if (retval > 0) { + LOG_FN_CONN(conn, (LOG_INFO,LD_NET, + "Holding conn (fd %d) open for more flushing.", + (int)conn->s)); + conn->timestamp_last_write_allowed = now; /* reset so we can flush + * more */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + + /* Connection must flush before closing, but it's being rate-limited. + * Let's remove from Libevent, and mark it as blocked on bandwidth + * so it will be re-added on next token bucket refill. Prevents + * busy Libevent loops where we keep ending up here and returning + * 0 until we are no longer blocked on bandwidth. + */ + connection_consider_empty_read_buckets(conn); + connection_consider_empty_write_buckets(conn); + + /* Make sure that consider_empty_buckets really disabled the + * connection: */ + if (BUG(connection_is_writing(conn))) { + connection_write_bw_exhausted(conn, true); + } + if (BUG(connection_is_reading(conn))) { + /* XXXX+ We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ + connection_read_bw_exhausted(conn, true/* kludge. */); + } + } + return 0; + } + if (connection_wants_to_flush(conn)) { + log_fn(LOG_INFO, LD_NET, "We stalled too much while trying to write %d " + "bytes to address %s. If this happens a lot, either " + "something is wrong with your network connection, or " + "something is wrong with theirs. " + "(fd %d, type %s, state %d, marked at %s:%d).", + (int)connection_get_outbuf_len(conn), + escaped_safe_str_client(conn->address), + (int)conn->s, conn_type_to_string(conn->type), conn->state, + conn->marked_for_close_file, + conn->marked_for_close); + } + } + + connection_unlink(conn); /* unlink, remove, free */ + return 1; +} + +/** Implementation for directory_all_unreachable. This is done in a callback, + * since otherwise it would complicate Tor's control-flow graph beyond all + * reason. + */ +static void +directory_all_unreachable_cb(mainloop_event_t *event, void *arg) +{ + (void)event; + (void)arg; + + connection_t *conn; + + while ((conn = connection_get_by_type_state(CONN_TYPE_AP, + AP_CONN_STATE_CIRCUIT_WAIT))) { + entry_connection_t *entry_conn = TO_ENTRY_CONN(conn); + log_notice(LD_NET, + "Is your network connection down? " + "Failing connection to '%s:%d'.", + safe_str_client(entry_conn->socks_request->address), + entry_conn->socks_request->port); + connection_mark_unattached_ap(entry_conn, + END_STREAM_REASON_NET_UNREACHABLE); + } + control_event_general_error("DIR_ALL_UNREACHABLE"); +} + +static mainloop_event_t *directory_all_unreachable_cb_event = NULL; + +/** We've just tried every dirserver we know about, and none of + * them were reachable. Assume the network is down. Change state + * so next time an application connection arrives we'll delay it + * and try another directory fetch. Kill off all the circuit_wait + * streams that are waiting now, since they will all timeout anyway. + */ +void +directory_all_unreachable(time_t now) +{ + (void)now; + + reset_uptime(); /* reset it */ + + if (!directory_all_unreachable_cb_event) { + directory_all_unreachable_cb_event = + mainloop_event_new(directory_all_unreachable_cb, NULL); + tor_assert(directory_all_unreachable_cb_event); + } + + mainloop_event_activate(directory_all_unreachable_cb_event); +} + +/** This function is called whenever we successfully pull down some new + * network statuses or server descriptors. */ +void +directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) +{ + const or_options_t *options = get_options(); + + /* if we have enough dir info, then update our guard status with + * whatever we just learned. */ + int invalidate_circs = guards_update_all(); + + if (invalidate_circs) { + circuit_mark_all_unused_circs(); + circuit_mark_all_dirty_circs_as_unusable(); + } + + if (!router_have_minimum_dir_info()) { + int quiet = suppress_logs || from_cache || + directory_too_idle_to_fetch_descriptors(options, now); + tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, + "I learned some more directory information, but not enough to " + "build a circuit: %s", get_dir_info_status_string()); + update_all_descriptor_downloads(now); + return; + } else { + if (directory_fetches_from_authorities(options)) { + update_all_descriptor_downloads(now); + } + + /* Don't even bother trying to get extrainfo until the rest of our + * directory info is up-to-date */ + if (options->DownloadExtraInfo) + update_extrainfo_downloads(now); + } + + if (server_mode(options) && !net_is_disabled() && !from_cache && + (have_completed_a_circuit() || !any_predicted_circuits(now))) + router_do_reachability_checks(1, 1); +} + +/** Perform regular maintenance tasks for a single connection. This + * function gets run once per second per connection by run_scheduled_events. + */ +static void +run_connection_housekeeping(int i, time_t now) +{ + cell_t cell; + connection_t *conn = smartlist_get(connection_array, i); + const or_options_t *options = get_options(); + or_connection_t *or_conn; + channel_t *chan = NULL; + int have_any_circuits; + int past_keepalive = + now >= conn->timestamp_last_write_allowed + options->KeepalivePeriod; + + if (conn->outbuf && !connection_get_outbuf_len(conn) && + conn->type == CONN_TYPE_OR) + TO_OR_CONN(conn)->timestamp_lastempty = now; + + if (conn->marked_for_close) { + /* nothing to do here */ + return; + } + + /* Expire any directory connections that haven't been active (sent + * if a server or received if a client) for 5 min */ + if (conn->type == CONN_TYPE_DIR && + ((DIR_CONN_IS_SERVER(conn) && + conn->timestamp_last_write_allowed + + options->TestingDirConnectionMaxStall < now) || + (!DIR_CONN_IS_SERVER(conn) && + conn->timestamp_last_read_allowed + + options->TestingDirConnectionMaxStall < now))) { + log_info(LD_DIR,"Expiring wedged directory conn (fd %d, purpose %d)", + (int)conn->s, conn->purpose); + /* This check is temporary; it's to let us know whether we should consider + * parsing partial serverdesc responses. */ + if (conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && + connection_get_inbuf_len(conn) >= 1024) { + log_info(LD_DIR,"Trying to extract information from wedged server desc " + "download."); + connection_dir_reached_eof(TO_DIR_CONN(conn)); + } else { + connection_mark_for_close(conn); + } + return; + } + + if (!connection_speaks_cells(conn)) + return; /* we're all done here, the rest is just for OR conns */ + + /* If we haven't flushed to an OR connection for a while, then either nuke + the connection or send a keepalive, depending. */ + + or_conn = TO_OR_CONN(conn); + tor_assert(conn->outbuf); + + chan = TLS_CHAN_TO_BASE(or_conn->chan); + tor_assert(chan); + + if (channel_num_circuits(chan) != 0) { + have_any_circuits = 1; + chan->timestamp_last_had_circuits = now; + } else { + have_any_circuits = 0; + } + + if (channel_is_bad_for_new_circs(TLS_CHAN_TO_BASE(or_conn->chan)) && + ! have_any_circuits) { + /* It's bad for new circuits, and has no unmarked circuits on it: + * mark it now. */ + log_info(LD_OR, + "Expiring non-used OR connection to fd %d (%s:%d) [Too old].", + (int)conn->s, conn->address, conn->port); + if (conn->state == OR_CONN_STATE_CONNECTING) + connection_or_connect_failed(TO_OR_CONN(conn), + END_OR_CONN_REASON_TIMEOUT, + "Tor gave up on the connection"); + connection_or_close_normally(TO_OR_CONN(conn), 1); + } else if (!connection_state_is_open(conn)) { + if (past_keepalive) { + /* We never managed to actually get this connection open and happy. */ + log_info(LD_OR,"Expiring non-open OR connection to fd %d (%s:%d).", + (int)conn->s,conn->address, conn->port); + connection_or_close_normally(TO_OR_CONN(conn), 0); + } + } else if (we_are_hibernating() && + ! have_any_circuits && + !connection_get_outbuf_len(conn)) { + /* We're hibernating or shutting down, there's no circuits, and nothing to + * flush.*/ + log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " + "[Hibernating or exiting].", + (int)conn->s,conn->address, conn->port); + connection_or_close_normally(TO_OR_CONN(conn), 1); + } else if (!have_any_circuits && + now - or_conn->idle_timeout >= + chan->timestamp_last_had_circuits) { + log_info(LD_OR,"Expiring non-used OR connection %"PRIu64" to fd %d " + "(%s:%d) [no circuits for %d; timeout %d; %scanonical].", + (chan->global_identifier), + (int)conn->s, conn->address, conn->port, + (int)(now - chan->timestamp_last_had_circuits), + or_conn->idle_timeout, + or_conn->is_canonical ? "" : "non"); + connection_or_close_normally(TO_OR_CONN(conn), 0); + } else if ( + now >= or_conn->timestamp_lastempty + options->KeepalivePeriod*10 && + now >= + conn->timestamp_last_write_allowed + options->KeepalivePeriod*10) { + log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL, + "Expiring stuck OR connection to fd %d (%s:%d). (%d bytes to " + "flush; %d seconds since last write)", + (int)conn->s, conn->address, conn->port, + (int)connection_get_outbuf_len(conn), + (int)(now-conn->timestamp_last_write_allowed)); + connection_or_close_normally(TO_OR_CONN(conn), 0); + } else if (past_keepalive && !connection_get_outbuf_len(conn)) { + /* send a padding cell */ + log_fn(LOG_DEBUG,LD_OR,"Sending keepalive to (%s:%d)", + conn->address, conn->port); + memset(&cell,0,sizeof(cell_t)); + cell.command = CELL_PADDING; + connection_or_write_cell_to_buf(&cell, or_conn); + } else { + channelpadding_decide_to_pad_channel(chan); + } +} + +/** Honor a NEWNYM request: make future requests unlinkable to past + * requests. */ +static void +signewnym_impl(time_t now) +{ + const or_options_t *options = get_options(); + if (!proxy_mode(options)) { + log_info(LD_CONTROL, "Ignoring SIGNAL NEWNYM because client functionality " + "is disabled."); + return; + } + + circuit_mark_all_dirty_circs_as_unusable(); + addressmap_clear_transient(); + hs_client_purge_state(); + time_of_last_signewnym = now; + signewnym_is_pending = 0; + + ++newnym_epoch; + + control_event_signal(SIGNEWNYM); +} + +/** Callback: run a deferred signewnym. */ +static void +handle_deferred_signewnym_cb(mainloop_event_t *event, void *arg) +{ + (void)event; + (void)arg; + log_info(LD_CONTROL, "Honoring delayed NEWNYM request"); + do_signewnym(time(NULL)); +} + +/** Either perform a signewnym or schedule one, depending on rate limiting. */ +void +do_signewnym(time_t now) +{ + if (time_of_last_signewnym + MAX_SIGNEWNYM_RATE > now) { + const time_t delay_sec = + time_of_last_signewnym + MAX_SIGNEWNYM_RATE - now; + if (! signewnym_is_pending) { + signewnym_is_pending = 1; + if (!handle_deferred_signewnym_ev) { + handle_deferred_signewnym_ev = + mainloop_event_postloop_new(handle_deferred_signewnym_cb, NULL); + } + const struct timeval delay_tv = { delay_sec, 0 }; + mainloop_event_schedule(handle_deferred_signewnym_ev, &delay_tv); + } + log_notice(LD_CONTROL, + "Rate limiting NEWNYM request: delaying by %d second(s)", + (int)(delay_sec)); + } else { + signewnym_impl(now); + } +} + +/** Return the number of times that signewnym has been called. */ +unsigned +get_signewnym_epoch(void) +{ + return newnym_epoch; +} + +/** True iff we have initialized all the members of periodic_events. + * Used to prevent double-initialization. */ +static int periodic_events_initialized = 0; + +/* Declare all the timer callback functions... */ +#undef CALLBACK +#define CALLBACK(name) \ + static int name ## _callback(time_t, const or_options_t *) +CALLBACK(add_entropy); +CALLBACK(check_authority_cert); +CALLBACK(check_canonical_channels); +CALLBACK(check_descriptor); +CALLBACK(check_dns_honesty); +CALLBACK(check_ed_keys); +CALLBACK(check_expired_networkstatus); +CALLBACK(check_for_reachability_bw); +CALLBACK(check_onion_keys_expiry_time); +CALLBACK(clean_caches); +CALLBACK(clean_consdiffmgr); +CALLBACK(dirvote); +CALLBACK(downrate_stability); +CALLBACK(expire_old_ciruits_serverside); +CALLBACK(fetch_networkstatus); +CALLBACK(heartbeat); +CALLBACK(hs_service); +CALLBACK(launch_descriptor_fetches); +CALLBACK(launch_reachability_tests); +CALLBACK(reachability_warnings); +CALLBACK(record_bridge_stats); +CALLBACK(rend_cache_failure_clean); +CALLBACK(reset_padding_counts); +CALLBACK(retry_dns); +CALLBACK(retry_listeners); +CALLBACK(rotate_onion_key); +CALLBACK(rotate_x509_certificate); +CALLBACK(save_stability); +CALLBACK(save_state); +CALLBACK(write_bridge_ns); +CALLBACK(write_stats_file); + +#undef CALLBACK + +/* Now we declare an array of periodic_event_item_t for each periodic event */ +#define CALLBACK(name, r, f) PERIODIC_EVENT(name, r, f) + +STATIC periodic_event_item_t periodic_events[] = { + /* Everyone needs to run those. */ + CALLBACK(add_entropy, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(check_expired_networkstatus, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(clean_caches, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(fetch_networkstatus, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(heartbeat, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(launch_descriptor_fetches, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(reset_padding_counts, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(save_state, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL, 0), + + /* Routers (bridge and relay) only. */ + CALLBACK(check_descriptor, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(reachability_warnings, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER, 0), + + /* Authorities (bridge and directory) only. */ + CALLBACK(downrate_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), + CALLBACK(launch_reachability_tests, PERIODIC_EVENT_ROLE_AUTHORITIES, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(save_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), + + /* Directory authority only. */ + CALLBACK(check_authority_cert, PERIODIC_EVENT_ROLE_DIRAUTH, 0), + CALLBACK(dirvote, PERIODIC_EVENT_ROLE_DIRAUTH, PERIODIC_EVENT_FLAG_NEED_NET), + + /* Relay only. */ + CALLBACK(check_canonical_channels, PERIODIC_EVENT_ROLE_RELAY, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_dns_honesty, PERIODIC_EVENT_ROLE_RELAY, + PERIODIC_EVENT_FLAG_NEED_NET), + + /* Hidden Service service only. */ + CALLBACK(hs_service, PERIODIC_EVENT_ROLE_HS_SERVICE, + PERIODIC_EVENT_FLAG_NEED_NET), + + /* Bridge only. */ + CALLBACK(record_bridge_stats, PERIODIC_EVENT_ROLE_BRIDGE, 0), + + /* Client only. */ + CALLBACK(rend_cache_failure_clean, PERIODIC_EVENT_ROLE_CLIENT, 0), + + /* Bridge Authority only. */ + CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH, 0), + + /* Directory server only. */ + CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_DIRSERVER, 0), + + END_OF_PERIODIC_EVENTS +}; +#undef CALLBACK + +/* These are pointers to members of periodic_events[] that are used to + * implement particular callbacks. We keep them separate here so that we + * can access them by name. We also keep them inside periodic_events[] + * so that we can implement "reset all timers" in a reasonable way. */ +static periodic_event_item_t *check_descriptor_event=NULL; +static periodic_event_item_t *dirvote_event=NULL; +static periodic_event_item_t *fetch_networkstatus_event=NULL; +static periodic_event_item_t *launch_descriptor_fetches_event=NULL; +static periodic_event_item_t *check_dns_honesty_event=NULL; +static periodic_event_item_t *save_state_event=NULL; + +/** Reset all the periodic events so we'll do all our actions again as if we + * just started up. + * Useful if our clock just moved back a long time from the future, + * so we don't wait until that future arrives again before acting. + */ +void +reset_all_main_loop_timers(void) +{ + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_reschedule(&periodic_events[i]); + } +} + +/** Return the member of periodic_events[] whose name is name. + * Return NULL if no such event is found. + */ +static periodic_event_item_t * +find_periodic_event(const char *name) +{ + int i; + for (i = 0; periodic_events[i].name; ++i) { + if (strcmp(name, periodic_events[i].name) == 0) + return &periodic_events[i]; + } + return NULL; +} + +/** Return a bitmask of the roles this tor instance is configured for using + * the given options. */ +STATIC int +get_my_roles(const or_options_t *options) +{ + tor_assert(options); + + int roles = 0; + int is_bridge = options->BridgeRelay; - int is_client = options_any_client_port_set(options); + int is_relay = server_mode(options); + int is_dirauth = authdir_mode_v3(options); + int is_bridgeauth = authdir_mode_bridge(options); + int is_hidden_service = !!hs_service_get_num_services() || + !!rend_num_services(); + int is_dirserver = dir_server_mode(options); ++ /* We also consider tor to have the role of a client if the ControlPort is ++ * set because a lot of things can be done over the control port which ++ * requires tor to have basic functionnalities. */ ++ int is_client = options_any_client_port_set(options) || ++ options->ControlPort_set || ++ options->OwningControllerFD >= 0; + + if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; + if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT; + if (is_relay) roles |= PERIODIC_EVENT_ROLE_RELAY; + if (is_dirauth) roles |= PERIODIC_EVENT_ROLE_DIRAUTH; + if (is_bridgeauth) roles |= PERIODIC_EVENT_ROLE_BRIDGEAUTH; + if (is_hidden_service) roles |= PERIODIC_EVENT_ROLE_HS_SERVICE; + if (is_dirserver) roles |= PERIODIC_EVENT_ROLE_DIRSERVER; + + return roles; +} + +/** Event to run initialize_periodic_events_cb */ +static struct event *initialize_periodic_events_event = NULL; + +/** Helper, run one second after setup: + * Initializes all members of periodic_events and starts them running. + * + * (We do this one second after setup for backward-compatibility reasons; + * it might not actually be necessary.) */ +static void +initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) +{ + (void) fd; + (void) events; + (void) data; + + tor_event_free(initialize_periodic_events_event); + + rescan_periodic_events(get_options()); +} + +/** Set up all the members of periodic_events[], and configure them all to be + * launched from a callback. */ +STATIC void +initialize_periodic_events(void) +{ + if (periodic_events_initialized) + return; + + periodic_events_initialized = 1; + + /* Set up all periodic events. We'll launch them by roles. */ + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_setup(&periodic_events[i]); + } + +#define NAMED_CALLBACK(name) \ + STMT_BEGIN name ## _event = find_periodic_event( #name ); STMT_END + + NAMED_CALLBACK(check_descriptor); + NAMED_CALLBACK(dirvote); + NAMED_CALLBACK(fetch_networkstatus); + NAMED_CALLBACK(launch_descriptor_fetches); + NAMED_CALLBACK(check_dns_honesty); + NAMED_CALLBACK(save_state); + + struct timeval one_second = { 1, 0 }; + initialize_periodic_events_event = tor_evtimer_new( + tor_libevent_get_base(), + initialize_periodic_events_cb, NULL); + event_add(initialize_periodic_events_event, &one_second); +} + +STATIC void +teardown_periodic_events(void) +{ + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_destroy(&periodic_events[i]); + } + periodic_events_initialized = 0; +} + +/** Do a pass at all our periodic events, disable those we don't need anymore + * and enable those we need now using the given options. */ +void +rescan_periodic_events(const or_options_t *options) +{ + tor_assert(options); + + /* Avoid scanning the event list if we haven't initialized it yet. This is + * particularly useful for unit tests in order to avoid initializing main + * loop events everytime. */ + if (!periodic_events_initialized) { + return; + } + + int roles = get_my_roles(options); + + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + + /* Handle the event flags. */ + if (net_is_disabled() && + (item->flags & PERIODIC_EVENT_FLAG_NEED_NET)) { + continue; + } + + /* Enable the event if needed. It is safe to enable an event that was + * already enabled. Same goes for disabling it. */ + if (item->roles & roles) { + log_debug(LD_GENERAL, "Launching periodic event %s", item->name); + periodic_event_enable(item); + } else { + log_debug(LD_GENERAL, "Disabling periodic event %s", item->name); + periodic_event_disable(item); + } + } +} + +/* We just got new options globally set, see if we need to enabled or disable + * periodic events. */ +void +periodic_events_on_new_options(const or_options_t *options) +{ + /* Only if we've already initialized the events, rescan the list which will + * enable or disable events depending on our roles. This will be called at + * bootup and we don't want this function to initialize the events because + * they aren't set up at this stage. */ + if (periodic_events_initialized) { + rescan_periodic_events(options); + } +} + +/** + * Update our schedule so that we'll check whether we need to update our + * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL + * seconds. + */ +void +reschedule_descriptor_update_check(void) +{ + if (check_descriptor_event) { + periodic_event_reschedule(check_descriptor_event); + } +} + +/** + * Update our schedule so that we'll check whether we need to fetch directory + * info immediately. + */ +void +reschedule_directory_downloads(void) +{ + tor_assert(fetch_networkstatus_event); + tor_assert(launch_descriptor_fetches_event); + + periodic_event_reschedule(fetch_networkstatus_event); + periodic_event_reschedule(launch_descriptor_fetches_event); +} + +/** Mainloop callback: clean up circuits, channels, and connections + * that are pending close. */ +static void +postloop_cleanup_cb(mainloop_event_t *ev, void *arg) +{ + (void)ev; + (void)arg; + circuit_close_all_marked(); + close_closeable_connections(); + channel_run_cleanup(); + channel_listener_run_cleanup(); +} + +/** Event to run postloop_cleanup_cb */ +static mainloop_event_t *postloop_cleanup_ev=NULL; + +/** Schedule a post-loop event to clean up marked channels, connections, and + * circuits. */ +void +mainloop_schedule_postloop_cleanup(void) +{ + if (PREDICT_UNLIKELY(postloop_cleanup_ev == NULL)) { + // (It's possible that we can get here if we decide to close a connection + // in the earliest stages of our configuration, before we create events.) + return; + } + mainloop_event_activate(postloop_cleanup_ev); +} + +#define LONGEST_TIMER_PERIOD (30 * 86400) +/** Helper: Return the number of seconds between now and next, + * clipped to the range [1 second, LONGEST_TIMER_PERIOD]. */ +static inline int +safe_timer_diff(time_t now, time_t next) +{ + if (next > now) { + /* There were no computers at signed TIME_MIN (1902 on 32-bit systems), + * and nothing that could run Tor. It's a bug if 'next' is around then. + * On 64-bit systems with signed TIME_MIN, TIME_MIN is before the Big + * Bang. We cannot extrapolate past a singularity, but there was probably + * nothing that could run Tor then, either. + **/ + tor_assert(next > TIME_MIN + LONGEST_TIMER_PERIOD); + + if (next - LONGEST_TIMER_PERIOD > now) + return LONGEST_TIMER_PERIOD; + return (int)(next - now); + } else { + return 1; + } +} + +/** Perform regular maintenance tasks. This function gets run once per + * second by second_elapsed_callback(). + */ +static void +run_scheduled_events(time_t now) +{ + const or_options_t *options = get_options(); + + /* 0. See if we've been asked to shut down and our timeout has + * expired; or if our bandwidth limits are exhausted and we + * should hibernate; or if it's time to wake up from hibernation. + */ + consider_hibernation(now); + + /* Maybe enough time elapsed for us to reconsider a circuit. */ + circuit_upgrade_circuits_from_guard_wait(); + + if (options->UseBridges && !net_is_disabled()) { + /* Note: this check uses net_is_disabled(), not should_delay_dir_fetches() + * -- the latter is only for fetching consensus-derived directory info. */ + fetch_bridge_descriptors(options, now); + } + + if (accounting_is_enabled(options)) { + accounting_run_housekeeping(now); + } + + /* 3a. Every second, we examine pending circuits and prune the + * ones which have been pending for more than a few seconds. + * We do this before step 4, so it can try building more if + * it's not comfortable with the number of available circuits. + */ + /* (If our circuit build timeout can ever become lower than a second (which + * it can't, currently), we should do this more often.) */ + circuit_expire_building(); + circuit_expire_waiting_for_better_guard(); + + /* 3b. Also look at pending streams and prune the ones that 'began' + * a long time ago but haven't gotten a 'connected' yet. + * Do this before step 4, so we can put them back into pending + * state to be picked up by the new circuit. + */ + connection_ap_expire_beginning(); + + /* 3c. And expire connections that we've held open for too long. + */ + connection_expire_held_open(); + + /* 4. Every second, we try a new circuit if there are no valid + * circuits. Every NewCircuitPeriod seconds, we expire circuits + * that became dirty more than MaxCircuitDirtiness seconds ago, + * and we make a new circ if there are no clean circuits. + */ + const int have_dir_info = router_have_minimum_dir_info(); + if (have_dir_info && !net_is_disabled()) { + circuit_build_needed_circs(now); + } else { + circuit_expire_old_circs_as_needed(now); + } + + /* 5. We do housekeeping for each connection... */ + channel_update_bad_for_new_circs(NULL, 0); + int i; + for (i=0;i<smartlist_len(connection_array);i++) { + run_connection_housekeeping(i, now); + } + + /* 11b. check pending unconfigured managed proxies */ + if (!net_is_disabled() && pt_proxies_configuration_pending()) + pt_configure_remaining_proxies(); +} + +/* Periodic callback: rotate the onion keys after the period defined by the + * "onion-key-rotation-days" consensus parameter, shut down and restart all + * cpuworkers, and update our descriptor if necessary. + */ +static int +rotate_onion_key_callback(time_t now, const or_options_t *options) +{ + if (server_mode(options)) { + int onion_key_lifetime = get_onion_key_lifetime(); + time_t rotation_time = get_onion_key_set_at()+onion_key_lifetime; + if (rotation_time > now) { + return ONION_KEY_CONSENSUS_CHECK_INTERVAL; + } + + log_info(LD_GENERAL,"Rotating onion key."); + rotate_onion_key(); + cpuworkers_rotate_keyinfo(); + if (router_rebuild_descriptor(1)<0) { + log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); + } + if (advertised_server_mode() && !net_is_disabled()) + router_upload_dir_desc_to_dirservers(0); + return ONION_KEY_CONSENSUS_CHECK_INTERVAL; + } + return PERIODIC_EVENT_NO_UPDATE; +} + +/* Period callback: Check if our old onion keys are still valid after the + * period of time defined by the consensus parameter + * "onion-key-grace-period-days", otherwise expire them by setting them to + * NULL. + */ +static int +check_onion_keys_expiry_time_callback(time_t now, const or_options_t *options) +{ + if (server_mode(options)) { + int onion_key_grace_period = get_onion_key_grace_period(); + time_t expiry_time = get_onion_key_set_at()+onion_key_grace_period; + if (expiry_time > now) { + return ONION_KEY_CONSENSUS_CHECK_INTERVAL; + } + + log_info(LD_GENERAL, "Expiring old onion keys."); + expire_old_onion_keys(); + cpuworkers_rotate_keyinfo(); + return ONION_KEY_CONSENSUS_CHECK_INTERVAL; + } + + return PERIODIC_EVENT_NO_UPDATE; +} + +/* Periodic callback: Every 30 seconds, check whether it's time to make new + * Ed25519 subkeys. + */ +static int +check_ed_keys_callback(time_t now, const or_options_t *options) +{ + if (server_mode(options)) { + if (should_make_new_ed_keys(options, now)) { + int new_signing_key = load_ed_keys(options, now); + if (new_signing_key < 0 || + generate_ed_link_cert(options, now, new_signing_key > 0)) { + log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); + tor_shutdown_event_loop_and_exit(1); + } + } + return 30; + } + return PERIODIC_EVENT_NO_UPDATE; +} + +/** + * Periodic callback: Every {LAZY,GREEDY}_DESCRIPTOR_RETRY_INTERVAL, + * see about fetching descriptors, microdescriptors, and extrainfo + * documents. + */ +static int +launch_descriptor_fetches_callback(time_t now, const or_options_t *options) +{ + if (should_delay_dir_fetches(options, NULL)) + return PERIODIC_EVENT_NO_UPDATE; + + update_all_descriptor_downloads(now); + update_extrainfo_downloads(now); + if (router_have_minimum_dir_info()) + return LAZY_DESCRIPTOR_RETRY_INTERVAL; + else + return GREEDY_DESCRIPTOR_RETRY_INTERVAL; +} + +/** + * Periodic event: Rotate our X.509 certificates and TLS keys once every + * MAX_SSL_KEY_LIFETIME_INTERNAL. + */ +static int +rotate_x509_certificate_callback(time_t now, const or_options_t *options) +{ + static int first = 1; + (void)now; + (void)options; + if (first) { + first = 0; + return MAX_SSL_KEY_LIFETIME_INTERNAL; + } + + /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our + * TLS context. */ + log_info(LD_GENERAL,"Rotating tls context."); + if (router_initialize_tls_context() < 0) { + log_err(LD_BUG, "Error reinitializing TLS context"); + tor_assert_unreached(); + } + if (generate_ed_link_cert(options, now, 1)) { + log_err(LD_OR, "Unable to update Ed25519->TLS link certificate for " + "new TLS context."); + tor_assert_unreached(); + } + + /* We also make sure to rotate the TLS connections themselves if they've + * been up for too long -- but that's done via is_bad_for_new_circs in + * run_connection_housekeeping() above. */ + return MAX_SSL_KEY_LIFETIME_INTERNAL; +} + +/** + * Periodic callback: once an hour, grab some more entropy from the + * kernel and feed it to our CSPRNG. + **/ +static int +add_entropy_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + /* We already seeded once, so don't die on failure. */ + if (crypto_seed_rng() < 0) { + log_warn(LD_GENERAL, "Tried to re-seed RNG, but failed. We already " + "seeded once, though, so we won't exit here."); + } + + /** How often do we add more entropy to OpenSSL's RNG pool? */ +#define ENTROPY_INTERVAL (60*60) + return ENTROPY_INTERVAL; +} + +/** + * Periodic callback: if we're an authority, make sure we test + * the routers on the network for reachability. + */ +static int +launch_reachability_tests_callback(time_t now, const or_options_t *options) +{ + if (authdir_mode_tests_reachability(options) && + !net_is_disabled()) { + /* try to determine reachability of the other Tor relays */ + dirserv_test_reachability(now); + } + return REACHABILITY_TEST_INTERVAL; +} + +/** + * Periodic callback: if we're an authority, discount the stability + * information (and other rephist information) that's older. + */ +static int +downrate_stability_callback(time_t now, const or_options_t *options) +{ + (void)options; + /* 1d. Periodically, we discount older stability information so that new + * stability info counts more, and save the stability information to disk as + * appropriate. */ + time_t next = rep_hist_downrate_old_runs(now); + return safe_timer_diff(now, next); +} + +/** + * Periodic callback: if we're an authority, record our measured stability + * information from rephist in an mtbf file. + */ +static int +save_stability_callback(time_t now, const or_options_t *options) +{ + if (authdir_mode_tests_reachability(options)) { + if (rep_hist_record_mtbf_data(now, 1)<0) { + log_warn(LD_GENERAL, "Couldn't store mtbf data."); + } + } +#define SAVE_STABILITY_INTERVAL (30*60) + return SAVE_STABILITY_INTERVAL; +} + +/** + * Periodic callback: if we're an authority, check on our authority + * certificate (the one that authenticates our authority signing key). + */ +static int +check_authority_cert_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + /* 1e. Periodically, if we're a v3 authority, we check whether our cert is + * close to expiring and warn the admin if it is. */ + v3_authority_check_key_expiry(); +#define CHECK_V3_CERTIFICATE_INTERVAL (5*60) + return CHECK_V3_CERTIFICATE_INTERVAL; +} + +/** + * Scheduled callback: Run directory-authority voting functionality. + * + * The schedule is a bit complicated here, so dirvote_act() manages the + * schedule itself. + **/ +static int +dirvote_callback(time_t now, const or_options_t *options) +{ + if (!authdir_mode_v3(options)) { + tor_assert_nonfatal_unreached(); + return 3600; + } + + time_t next = dirvote_act(options, now); + if (BUG(next == TIME_MAX)) { + /* This shouldn't be returned unless we called dirvote_act() without + * being an authority. If it happens, maybe our configuration will + * fix itself in an hour or so? */ + return 3600; + } + return safe_timer_diff(now, next); +} + +/** Reschedule the directory-authority voting event. Run this whenever the + * schedule has changed. */ +void +reschedule_dirvote(const or_options_t *options) +{ + if (periodic_events_initialized && authdir_mode_v3(options)) { + periodic_event_reschedule(dirvote_event); + } +} + +/** + * Periodic callback: If our consensus is too old, recalculate whether + * we can actually use it. + */ +static int +check_expired_networkstatus_callback(time_t now, const or_options_t *options) +{ + (void)options; + /* Check whether our networkstatus has expired. */ + networkstatus_t *ns = networkstatus_get_latest_consensus(); + /*XXXX RD: This value needs to be the same as REASONABLY_LIVE_TIME in + * networkstatus_get_reasonably_live_consensus(), but that value is way + * way too high. Arma: is the bridge issue there resolved yet? -NM */ +#define NS_EXPIRY_SLOP (24*60*60) + if (ns && ns->valid_until < (now - NS_EXPIRY_SLOP) && + router_have_minimum_dir_info()) { + router_dir_info_changed(); + } +#define CHECK_EXPIRED_NS_INTERVAL (2*60) + return CHECK_EXPIRED_NS_INTERVAL; +} + +/** + * Scheduled callback: Save the state file to disk if appropriate. + */ +static int +save_state_callback(time_t now, const or_options_t *options) +{ + (void) options; + (void) or_state_save(now); // only saves if appropriate + const time_t next_write = get_or_state()->next_write; + if (next_write == TIME_MAX) { + return 86400; + } + return safe_timer_diff(now, next_write); +} + +/** Reschedule the event for saving the state file. + * + * Run this when the state becomes dirty. */ +void +reschedule_or_state_save(void) +{ + if (save_state_event == NULL) { + /* This can happen early on during startup. */ + return; + } + periodic_event_reschedule(save_state_event); +} + +/** + * Periodic callback: Write statistics to disk if appropriate. + */ +static int +write_stats_file_callback(time_t now, const or_options_t *options) +{ + /* 1g. Check whether we should write statistics to disk. + */ +#define CHECK_WRITE_STATS_INTERVAL (60*60) + time_t next_time_to_write_stats_files = now + CHECK_WRITE_STATS_INTERVAL; + if (options->CellStatistics) { + time_t next_write = + rep_hist_buffer_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->DirReqStatistics) { + time_t next_write = geoip_dirreq_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->EntryStatistics) { + time_t next_write = geoip_entry_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->HiddenServiceStatistics) { + time_t next_write = rep_hist_hs_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->ExitPortStatistics) { + time_t next_write = rep_hist_exit_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->ConnDirectionStatistics) { + time_t next_write = rep_hist_conn_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->BridgeAuthoritativeDir) { + time_t next_write = rep_hist_desc_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + + return safe_timer_diff(now, next_time_to_write_stats_files); +} + +#define CHANNEL_CHECK_INTERVAL (60*60) +static int +check_canonical_channels_callback(time_t now, const or_options_t *options) +{ + (void)now; + if (public_server_mode(options)) + channel_check_for_duplicates(); + + return CHANNEL_CHECK_INTERVAL; +} + +static int +reset_padding_counts_callback(time_t now, const or_options_t *options) +{ + if (options->PaddingStatistics) { + rep_hist_prep_published_padding_counts(now); + } + + rep_hist_reset_padding_counts(); + return REPHIST_CELL_PADDING_COUNTS_INTERVAL; +} + +static int should_init_bridge_stats = 1; + +/** + * Periodic callback: Write bridge statistics to disk if appropriate. + */ +static int +record_bridge_stats_callback(time_t now, const or_options_t *options) +{ + /* 1h. Check whether we should write bridge statistics to disk. + */ + if (should_record_bridge_info(options)) { + if (should_init_bridge_stats) { + /* (Re-)initialize bridge statistics. */ + geoip_bridge_stats_init(now); + should_init_bridge_stats = 0; + return WRITE_STATS_INTERVAL; + } else { + /* Possibly write bridge statistics to disk and ask when to write + * them next time. */ + time_t next = geoip_bridge_stats_write(now); + return safe_timer_diff(now, next); + } + } else if (!should_init_bridge_stats) { + /* Bridge mode was turned off. Ensure that stats are re-initialized + * next time bridge mode is turned on. */ + should_init_bridge_stats = 1; + } + return PERIODIC_EVENT_NO_UPDATE; +} + +/** + * Periodic callback: Clean in-memory caches every once in a while + */ +static int +clean_caches_callback(time_t now, const or_options_t *options) +{ + /* Remove old information from rephist and the rend cache. */ + rep_history_clean(now - options->RephistTrackTime); + rend_cache_clean(now, REND_CACHE_TYPE_SERVICE); + hs_cache_clean_as_client(now); + hs_cache_clean_as_dir(now); + microdesc_cache_rebuild(NULL, 0); +#define CLEAN_CACHES_INTERVAL (30*60) + return CLEAN_CACHES_INTERVAL; +} + +/** + * Periodic callback: Clean the cache of failed hidden service lookups + * frequently. + */ +static int +rend_cache_failure_clean_callback(time_t now, const or_options_t *options) +{ + (void)options; + /* We don't keep entries that are more than five minutes old so we try to + * clean it as soon as we can since we want to make sure the client waits + * as little as possible for reachability reasons. */ + rend_cache_failure_clean(now); + hs_cache_client_intro_state_clean(now); + return 30; +} + +/** + * Periodic callback: If we're a server and initializing dns failed, retry. + */ +static int +retry_dns_callback(time_t now, const or_options_t *options) +{ + (void)now; +#define RETRY_DNS_INTERVAL (10*60) + if (server_mode(options) && has_dns_init_failed()) + dns_init(); + return RETRY_DNS_INTERVAL; +} + +/** Periodic callback: consider rebuilding or and re-uploading our descriptor + * (if we've passed our internal checks). */ +static int +check_descriptor_callback(time_t now, const or_options_t *options) +{ +/** How often do we check whether part of our router info has changed in a + * way that would require an upload? That includes checking whether our IP + * address has changed. */ +#define CHECK_DESCRIPTOR_INTERVAL (60) + + (void)options; + + /* 2b. Once per minute, regenerate and upload the descriptor if the old + * one is inaccurate. */ + if (!net_is_disabled()) { + check_descriptor_bandwidth_changed(now); + check_descriptor_ipaddress_changed(now); + mark_my_descriptor_dirty_if_too_old(now); + consider_publishable_server(0); + /* If any networkstatus documents are no longer recent, we need to + * update all the descriptors' running status. */ + /* Remove dead routers. */ + /* XXXX This doesn't belong here, but it was here in the pre- + * XXXX refactoring code. */ + routerlist_remove_old_routers(); + } + + return CHECK_DESCRIPTOR_INTERVAL; +} + +/** + * Periodic callback: check whether we're reachable (as a relay), and + * whether our bandwidth has changed enough that we need to + * publish a new descriptor. + */ +static int +check_for_reachability_bw_callback(time_t now, const or_options_t *options) +{ + /* XXXX This whole thing was stuck in the middle of what is now + * XXXX check_descriptor_callback. I'm not sure it's right. */ + + static int dirport_reachability_count = 0; + /* also, check religiously for reachability, if it's within the first + * 20 minutes of our uptime. */ + if (server_mode(options) && + (have_completed_a_circuit() || !any_predicted_circuits(now)) && + !net_is_disabled()) { + if (get_uptime() < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { + router_do_reachability_checks(1, dirport_reachability_count==0); + if (++dirport_reachability_count > 5) + dirport_reachability_count = 0; + return 1; + } else { + /* If we haven't checked for 12 hours and our bandwidth estimate is + * low, do another bandwidth test. This is especially important for + * bridges, since they might go long periods without much use. */ + const routerinfo_t *me = router_get_my_routerinfo(); + static int first_time = 1; + if (!first_time && me && + me->bandwidthcapacity < me->bandwidthrate && + me->bandwidthcapacity < 51200) { + reset_bandwidth_test(); + } + first_time = 0; +#define BANDWIDTH_RECHECK_INTERVAL (12*60*60) + return BANDWIDTH_RECHECK_INTERVAL; + } + } + return CHECK_DESCRIPTOR_INTERVAL; +} + +/** + * Periodic event: once a minute, (or every second if TestingTorNetwork, or + * during client bootstrap), check whether we want to download any + * networkstatus documents. */ +static int +fetch_networkstatus_callback(time_t now, const or_options_t *options) +{ + /* How often do we check whether we should download network status + * documents? */ + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( + now); + const int prefer_mirrors = !directory_fetches_from_authorities( + get_options()); + int networkstatus_dl_check_interval = 60; + /* check more often when testing, or when bootstrapping from mirrors + * (connection limits prevent too many connections being made) */ + if (options->TestingTorNetwork + || (we_are_bootstrapping && prefer_mirrors)) { + networkstatus_dl_check_interval = 1; + } + + if (should_delay_dir_fetches(options, NULL)) + return PERIODIC_EVENT_NO_UPDATE; + + update_networkstatus_downloads(now); + return networkstatus_dl_check_interval; +} + +/** + * Periodic callback: Every 60 seconds, we relaunch listeners if any died. */ +static int +retry_listeners_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + if (!net_is_disabled()) { + retry_all_listeners(NULL, 0); + return 60; + } + return PERIODIC_EVENT_NO_UPDATE; +} + +/** + * Periodic callback: as a server, see if we have any old unused circuits + * that should be expired */ +static int +expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) +{ + (void)options; + /* every 11 seconds, so not usually the same second as other such events */ + circuit_expire_old_circuits_serverside(now); + return 11; +} + +/** + * Callback: Send warnings if Tor doesn't find its ports reachable. + */ +static int +reachability_warnings_callback(time_t now, const or_options_t *options) +{ + (void) now; + + if (get_uptime() < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { + return (int)(TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT - get_uptime()); + } + + if (server_mode(options) && + !net_is_disabled() && + have_completed_a_circuit()) { + /* every 20 minutes, check and complain if necessary */ + const routerinfo_t *me = router_get_my_routerinfo(); + if (me && !check_whether_orport_reachable(options)) { + char *address = tor_dup_ip(me->addr); + log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->or_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED ORADDRESS=%s:%d", + address, me->or_port); + tor_free(address); + } + + if (me && !check_whether_dirport_reachable(options)) { + char *address = tor_dup_ip(me->addr); + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that its " + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->dir_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED DIRADDRESS=%s:%d", + address, me->dir_port); + tor_free(address); + } + } + + return TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT; +} + +static int dns_honesty_first_time = 1; + +/** + * Periodic event: if we're an exit, see if our DNS server is telling us + * obvious lies. + */ +static int +check_dns_honesty_callback(time_t now, const or_options_t *options) +{ + (void)now; + /* 9. and if we're an exit node, check whether our DNS is telling stories + * to us. */ + if (net_is_disabled() || + ! public_server_mode(options) || + router_my_exit_policy_is_reject_star()) + return PERIODIC_EVENT_NO_UPDATE; + + if (dns_honesty_first_time) { + /* Don't launch right when we start */ + dns_honesty_first_time = 0; + return crypto_rand_int_range(60, 180); + } + + dns_launch_correctness_checks(); + return 12*3600 + crypto_rand_int(12*3600); +} + +/** + * Periodic callback: if we're the bridge authority, write a networkstatus + * file to disk. + */ +static int +write_bridge_ns_callback(time_t now, const or_options_t *options) +{ + /* 10. write bridge networkstatus file to disk */ + if (options->BridgeAuthoritativeDir) { + networkstatus_dump_bridge_status_to_file(now); +#define BRIDGE_STATUSFILE_INTERVAL (30*60) + return BRIDGE_STATUSFILE_INTERVAL; + } + return PERIODIC_EVENT_NO_UPDATE; +} + +static int heartbeat_callback_first_time = 1; + +/** + * Periodic callback: write the heartbeat message in the logs. + * + * If writing the heartbeat message to the logs fails for some reason, retry + * again after MIN_HEARTBEAT_PERIOD seconds. + */ +static int +heartbeat_callback(time_t now, const or_options_t *options) +{ + /* Check if heartbeat is disabled */ + if (!options->HeartbeatPeriod) { + return PERIODIC_EVENT_NO_UPDATE; + } + + /* Skip the first one. */ + if (heartbeat_callback_first_time) { + heartbeat_callback_first_time = 0; + return options->HeartbeatPeriod; + } + + /* Write the heartbeat message */ + if (log_heartbeat(now) == 0) { + return options->HeartbeatPeriod; + } else { + /* If we couldn't write the heartbeat log message, try again in the minimum + * interval of time. */ + return MIN_HEARTBEAT_PERIOD; + } +} + +#define CDM_CLEAN_CALLBACK_INTERVAL 600 +static int +clean_consdiffmgr_callback(time_t now, const or_options_t *options) +{ + (void)now; + if (dir_server_mode(options)) { + consdiffmgr_cleanup(); + } + return CDM_CLEAN_CALLBACK_INTERVAL; +} + +/* + * Periodic callback: Run scheduled events for HS service. This is called + * every second. + */ +static int +hs_service_callback(time_t now, const or_options_t *options) +{ + (void) options; + + /* We need to at least be able to build circuits and that we actually have + * a working network. */ + if (!have_completed_a_circuit() || net_is_disabled() || + networkstatus_get_live_consensus(now) == NULL) { + goto end; + } + + hs_service_run_scheduled_events(now); + + end: + /* Every 1 second. */ + return 1; +} + +/** Timer: used to invoke second_elapsed_callback() once per second. */ +static periodic_timer_t *second_timer = NULL; + +/** + * Enable or disable the per-second timer as appropriate, creating it if + * necessary. + */ +void +reschedule_per_second_timer(void) +{ + struct timeval one_second; + one_second.tv_sec = 1; + one_second.tv_usec = 0; + + if (! second_timer) { + second_timer = periodic_timer_new(tor_libevent_get_base(), + &one_second, + second_elapsed_callback, + NULL); + tor_assert(second_timer); + } + + const bool run_per_second_events = + control_any_per_second_event_enabled() || ! net_is_completely_disabled(); + + if (run_per_second_events) { + periodic_timer_launch(second_timer, &one_second); + } else { + periodic_timer_disable(second_timer); + } +} + +/** Last time that update_current_time was called. */ +static time_t current_second = 0; +/** Last time that update_current_time updated current_second. */ +static monotime_coarse_t current_second_last_changed; + +/** + * Set the current time to "now", which should be the value returned by + * time(). Check for clock jumps and track the total number of seconds we + * have been running. + */ +void +update_current_time(time_t now) +{ + if (PREDICT_LIKELY(now == current_second)) { + /* We call this function a lot. Most frequently, the current second + * will not have changed, so we just return. */ + return; + } + + const time_t seconds_elapsed = current_second ? (now - current_second) : 0; + + /* Check the wall clock against the monotonic clock, so we can + * better tell idleness from clock jumps and/or other shenanigans. */ + monotime_coarse_t last_updated; + memcpy(&last_updated, &current_second_last_changed, sizeof(last_updated)); + monotime_coarse_get(&current_second_last_changed); + + /** How much clock jumping do we tolerate? */ +#define NUM_JUMPED_SECONDS_BEFORE_WARN 100 + + /** How much idleness do we tolerate? */ +#define NUM_IDLE_SECONDS_BEFORE_WARN 3600 + + if (seconds_elapsed < -NUM_JUMPED_SECONDS_BEFORE_WARN) { + // moving back in time is always a bad sign. + circuit_note_clock_jumped(seconds_elapsed, false); + } else if (seconds_elapsed >= NUM_JUMPED_SECONDS_BEFORE_WARN) { + /* Compare the monotonic clock to the result of time(). */ + const int32_t monotime_msec_passed = + monotime_coarse_diff_msec32(&last_updated, + &current_second_last_changed); + const int monotime_sec_passed = monotime_msec_passed / 1000; + const int discrepancy = monotime_sec_passed - (int)seconds_elapsed; + /* If the monotonic clock deviates from time(NULL), we have a couple of + * possibilities. On some systems, this means we have been suspended or + * sleeping. Everywhere, it can mean that the wall-clock time has + * been changed -- for example, with settimeofday(). + * + * On the other hand, if the monotonic time matches with the wall-clock + * time, we've probably just been idle for a while, with no events firing. + * we tolerate much more of that. + */ + const bool clock_jumped = abs(discrepancy) > 2; + + if (clock_jumped || seconds_elapsed >= NUM_IDLE_SECONDS_BEFORE_WARN) { + circuit_note_clock_jumped(seconds_elapsed, ! clock_jumped); + } + } else if (seconds_elapsed > 0) { + stats_n_seconds_working += seconds_elapsed; + } + + update_approx_time(now); + current_second = now; +} + +/** Libevent callback: invoked once every second. */ +static void +second_elapsed_callback(periodic_timer_t *timer, void *arg) +{ + /* XXXX This could be sensibly refactored into multiple callbacks, and we + * could use Libevent's timers for this rather than checking the current + * time against a bunch of timeouts every second. */ + time_t now; + (void)timer; + (void)arg; + + now = time(NULL); + + /* We don't need to do this once-per-second any more: time-updating is + * only in this callback _because it is a callback_. It should be fine + * to disable this callback, and the time will still get updated. + */ + update_current_time(now); + + /* Maybe some controller events are ready to fire */ + control_per_second_events(); + + run_scheduled_events(now); +} + +#ifdef HAVE_SYSTEMD_209 +static periodic_timer_t *systemd_watchdog_timer = NULL; + +/** Libevent callback: invoked to reset systemd watchdog. */ +static void +systemd_watchdog_callback(periodic_timer_t *timer, void *arg) +{ + (void)timer; + (void)arg; + sd_notify(0, "WATCHDOG=1"); +} +#endif /* defined(HAVE_SYSTEMD_209) */ + +#define UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST (6*60*60) + +/** Called when our IP address seems to have changed. at_interface + * should be true if we detected a change in our interface, and false if we + * detected a change in our published address. */ +void +ip_address_changed(int at_interface) +{ + const or_options_t *options = get_options(); + int server = server_mode(options); + int exit_reject_interfaces = (server && options->ExitRelay + && options->ExitPolicyRejectLocalInterfaces); + + if (at_interface) { + if (! server) { + /* Okay, change our keys. */ + if (init_keys_client() < 0) + log_warn(LD_GENERAL, "Unable to rotate keys after IP change!"); + } + } else { + if (server) { + if (get_uptime() > UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST) + reset_bandwidth_test(); + reset_uptime(); + router_reset_reachability(); + } + } + + /* Exit relays incorporate interface addresses in their exit policies when + * ExitPolicyRejectLocalInterfaces is set */ + if (exit_reject_interfaces || (server && !at_interface)) { + mark_my_descriptor_dirty("IP address changed"); + } + + dns_servers_relaunch_checks(); +} + +/** Forget what we've learned about the correctness of our DNS servers, and + * start learning again. */ +void +dns_servers_relaunch_checks(void) +{ + if (server_mode(get_options())) { + dns_reset_correctness_checks(); + if (periodic_events_initialized) { + tor_assert(check_dns_honesty_event); + periodic_event_reschedule(check_dns_honesty_event); + } + } +} + +/** Initialize some mainloop_event_t objects that we require. */ +void +initialize_mainloop_events(void) +{ + initialize_periodic_events(); + + if (!schedule_active_linked_connections_event) { + schedule_active_linked_connections_event = + mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL); + } + if (!postloop_cleanup_ev) { + postloop_cleanup_ev = + mainloop_event_postloop_new(postloop_cleanup_cb, NULL); + } +} + +/** Tor main loop. */ +int +do_main_loop(void) +{ + /* initialize the periodic events first, so that code that depends on the + * events being present does not assert. + */ + initialize_periodic_events(); + initialize_mainloop_events(); + + /* set up once-a-second callback. */ + reschedule_per_second_timer(); + +#ifdef HAVE_SYSTEMD_209 + uint64_t watchdog_delay; + /* set up systemd watchdog notification. */ + if (sd_watchdog_enabled(1, &watchdog_delay) > 0) { + if (! systemd_watchdog_timer) { + struct timeval watchdog; + /* The manager will "act on" us if we don't send them a notification + * every 'watchdog_delay' microseconds. So, send notifications twice + * that often. */ + watchdog_delay /= 2; + watchdog.tv_sec = watchdog_delay / 1000000; + watchdog.tv_usec = watchdog_delay % 1000000; + + systemd_watchdog_timer = periodic_timer_new(tor_libevent_get_base(), + &watchdog, + systemd_watchdog_callback, + NULL); + tor_assert(systemd_watchdog_timer); + } + } +#endif /* defined(HAVE_SYSTEMD_209) */ + + main_loop_should_exit = 0; + main_loop_exit_value = 0; + +#ifdef ENABLE_RESTART_DEBUGGING + { + static int first_time = 1; + + if (first_time && getenv("TOR_DEBUG_RESTART")) { + first_time = 0; + const char *sec_str = getenv("TOR_DEBUG_RESTART_AFTER_SECONDS"); + long sec; + int sec_ok=0; + if (sec_str && + (sec = tor_parse_long(sec_str, 10, 0, INT_MAX, &sec_ok, NULL)) && + sec_ok) { + /* Okay, we parsed the seconds. */ + } else { + sec = 5; + } + struct timeval restart_after = { (time_t) sec, 0 }; + tor_shutdown_event_loop_for_restart_event = + tor_evtimer_new(tor_libevent_get_base(), + tor_shutdown_event_loop_for_restart_cb, NULL); + event_add(tor_shutdown_event_loop_for_restart_event, &restart_after); + } + } +#endif + + return run_main_loop_until_done(); +} + +#ifndef _WIN32 +/** Rate-limiter for EINVAL-type libevent warnings. */ +static ratelim_t libevent_error_ratelim = RATELIM_INIT(10); +#endif + +/** + * Run the main loop a single time. Return 0 for "exit"; -1 for "exit with + * error", and 1 for "run this again." + */ +static int +run_main_loop_once(void) +{ + int loop_result; + + if (nt_service_is_stopping()) + return 0; + + if (main_loop_should_exit) + return 0; + +#ifndef _WIN32 + /* Make it easier to tell whether libevent failure is our fault or not. */ + errno = 0; +#endif + + if (get_options()->MainloopStats) { + /* We always enforce that EVLOOP_ONCE is passed to event_base_loop() if we + * are collecting main loop statistics. */ + called_loop_once = 1; + } else { + called_loop_once = 0; + } + + /* Make sure we know (about) what time it is. */ + update_approx_time(time(NULL)); + + /* Here it is: the main loop. Here we tell Libevent to poll until we have + * an event, or the second ends, or until we have some active linked + * connections to trigger events for. Libevent will wait till one + * of these happens, then run all the appropriate callbacks. */ + loop_result = tor_libevent_run_event_loop(tor_libevent_get_base(), + called_loop_once); + + if (get_options()->MainloopStats) { + /* Update our main loop counters. */ + if (loop_result == 0) { + // The call was successful. + increment_main_loop_success_count(); + } else if (loop_result == -1) { + // The call was erroneous. + increment_main_loop_error_count(); + } else if (loop_result == 1) { + // The call didn't have any active or pending events + // to handle. + increment_main_loop_idle_count(); + } + } + + /* Oh, the loop failed. That might be an error that we need to + * catch, but more likely, it's just an interrupted poll() call or something, + * and we should try again. */ + if (loop_result < 0) { + int e = tor_socket_errno(-1); + /* let the program survive things like ^z */ + if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) { + log_err(LD_NET,"libevent call with %s failed: %s [%d]", + tor_libevent_get_method(), tor_socket_strerror(e), e); + return -1; +#ifndef _WIN32 + } else if (e == EINVAL) { + log_fn_ratelim(&libevent_error_ratelim, LOG_WARN, LD_NET, + "EINVAL from libevent: should you upgrade libevent?"); + if (libevent_error_ratelim.n_calls_since_last_time > 8) { + log_err(LD_NET, "Too many libevent errors, too fast: dying"); + return -1; + } +#endif /* !defined(_WIN32) */ + } else { + tor_assert_nonfatal_once(! ERRNO_IS_EINPROGRESS(e)); + log_debug(LD_NET,"libevent call interrupted."); + /* You can't trust the results of this poll(). Go back to the + * top of the big for loop. */ + return 1; + } + } + + if (main_loop_should_exit) + return 0; + + return 1; +} + +/** Run the run_main_loop_once() function until it declares itself done, + * and return its final return value. + * + * Shadow won't invoke this function, so don't fill it up with things. + */ +static int +run_main_loop_until_done(void) +{ + int loop_result = 1; + do { + loop_result = run_main_loop_once(); + } while (loop_result == 1); + + if (main_loop_should_exit) + return main_loop_exit_value; + else + return loop_result; +} + +/** Returns Tor's uptime. */ +MOCK_IMPL(long, +get_uptime,(void)) +{ + return stats_n_seconds_working; +} + +/** Reset Tor's uptime. */ +MOCK_IMPL(void, +reset_uptime,(void)) +{ + stats_n_seconds_working = 0; +} + +void +tor_mainloop_free_all(void) +{ + smartlist_free(connection_array); + smartlist_free(closeable_connection_lst); + smartlist_free(active_linked_connection_lst); + periodic_timer_free(second_timer); + teardown_periodic_events(); + tor_event_free(shutdown_did_not_work_event); + tor_event_free(initialize_periodic_events_event); + mainloop_event_free(directory_all_unreachable_cb_event); + mainloop_event_free(schedule_active_linked_connections_event); + mainloop_event_free(postloop_cleanup_ev); + mainloop_event_free(handle_deferred_signewnym_ev); + +#ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); +#endif + + stats_n_bytes_read = stats_n_bytes_written = 0; + + memset(&global_bucket, 0, sizeof(global_bucket)); + memset(&global_relayed_bucket, 0, sizeof(global_relayed_bucket)); + time_of_process_start = 0; + time_of_last_signewnym = 0; + signewnym_is_pending = 0; + newnym_epoch = 0; + called_loop_once = 0; + main_loop_should_exit = 0; + main_loop_exit_value = 0; + can_complete_circuits = 0; + quiet_level = 0; + should_init_bridge_stats = 1; + dns_honesty_first_time = 1; + heartbeat_callback_first_time = 1; + current_second = 0; + memset(&current_second_last_changed, 0, + sizeof(current_second_last_changed)); +}

1 0

[tor/master] Write a comment to explain may_need_rebind condition
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 89c4a3a0b6f824841ab03d39ca59acc73a80b728 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 15 16:13:22 2018 +0300 Write a comment to explain may_need_rebind condition --- src/core/mainloop/connection.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 5ebfac6be..5c0799fbe 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2797,6 +2797,15 @@ retry_listener_ports(smartlist_t *old_conns, break; } #ifdef ENABLE_LISTENER_REBIND + /* Rebinding may be needed if all of the following are true: + * 1) Address family is the same in old and new listeners. + * 2) Port number matches exactly (numeric value is the same). + * 3) *One* of listeners (either old one or new one) has a + * wildcard IP address (0.0.0.0 or [::]). + * + * These are the exact conditions for a first bind() syscall + * to fail with EADDRINUSE. + */ const int may_need_rebind = tor_addr_family(&wanted->addr) == tor_addr_family(&conn->addr) && port_matches_exact && bool_neq(tor_addr_is_null(&wanted->addr),

1 0

[tor/master] Refrain from listener rebinding when address families differ
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 9bb00a74bc4ebdb154e0f9289ed4ab362ee5c564 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 2 15:47:05 2018 +0300 Refrain from listener rebinding when address families differ --- changes/bug27928 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug27928 b/changes/bug27928 new file mode 100644 index 000000000..a4ea63e8f --- /dev/null +++ b/changes/bug27928 @@ -0,0 +1,4 @@ + o Minor bugfixes (networking): + - Refrain from attempting socket rebinding when old + and new listeners are in different address families. + Fixes bug 27928; bugfix on 0.3.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 9ef0561a5..5ebfac6be 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2798,6 +2798,7 @@ retry_listener_ports(smartlist_t *old_conns, } #ifdef ENABLE_LISTENER_REBIND const int may_need_rebind = + tor_addr_family(&wanted->addr) == tor_addr_family(&conn->addr) && port_matches_exact && bool_neq(tor_addr_is_null(&wanted->addr), tor_addr_is_null(&conn->addr)); if (replacements && may_need_rebind) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/404'
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 698629f5a9eca21e0251f5d249f176a00aebf871 Merge: 8a0b74148 89c4a3a0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 17:29:50 2018 -0400 Merge remote-tracking branch 'tor-github/pr/404' changes/bug27928 | 4 ++++ src/core/mainloop/connection.c | 10 ++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Add a tor_free() in tor_gencert to fix a coverity warning
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 8a0b7414870d2e0ddf90db8184b36be7309bd5c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 17:18:46 2018 -0400 Add a tor_free() in tor_gencert to fix a coverity warning --- src/tools/tor-gencert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a498c205b..238564125 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -190,6 +190,7 @@ parse_commandline(int argc, char **argv) fprintf(stderr, "%s must resolve to an IPv4 address", addr_arg); return 1; } + tor_free(address); address = tor_strdup(fmt_addrport(&addr, port)); } else if (!strcmp(argv[i], "--create-identity-key")) { make_new_id = 1;

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 16 Oct '18

16 Oct '18

commit d2828ba782e765eb5fe78d85645df2b73fad54c3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 19:19:00 2018 +0000 Update translations for support-portal_completed --- contents+zh_CN.po | 4075 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 4075 insertions(+) diff --git a/contents+zh_CN.po b/contents+zh_CN.po new file mode 100644 index 000000000..40c15c5c8 --- /dev/null +++ b/contents+zh_CN.po @@ -0,0 +1,4075 @@ +# Translators: +# erinm, 2018 +# ヨイツの賢狼ホロ <kenookamihoro(a)gmail.com>, 2018 +# Emma Peel, 2018 +# MD Rgiths <psychi2009(a)gmail.com>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-10-08 18:14+CET\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: MD Rgiths <psychi2009(a)gmail.com>, 2018\n" +"Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.description) +msgid "" +"Modifying the way that Tor creates its circuits is strongly discouraged." +msgstr "不推荐自行修改 Tor 线路。" + +#: http//localhost/tbb/tbb-17/ +#: (content/tbb/tbb-17/contents+en.lrquestion.description) +msgid "" +"However, be aware that your other browser is not keeping your activity " +"private, and you may forget and accidentally use that non-private browser to" +" do something that you intended to do in Tor Browser." +msgstr "但请注意，其他浏览器不能让您的活动保持私密，您可能会错误地使用非私密浏览器来执行您在 Tor Browser 中的操作。" + +#: http//localhost/misc/misc-4/ +#: (content/misc/misc-4/contents+en.lrquestion.description) +msgid "We do not recommend using Tor with BitTorrent." +msgstr "不推荐将 Tor 和 BitTorrent 一起使用。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "This could mean that you’re on a network that’s censored." +msgstr "这可能意味着您处于有审查的网络中。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Français (fr)" +msgstr "法语" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"In the case of banks, and other sensitive websites, it is also common to see" +" geography-based blocking (if a bank knows you generally access their " +"services from one country, and suddenly you are connecting from an exit " +"relay on the other side of the world, your account may be locked or " +"suspended)." +msgstr "" +"另外，银行等比较敏感的网站经常进行地区范围的屏蔽（例如如果你平时只在某个特定的国家使用他们的服务，从其他国家进行访问时你的账号可能就会被冻结）。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "Tor prevents eavesdroppers from learning sites that you visit." +msgstr "Tor Browser 防止窃听者获知您访问过的网站。" + +#: http//localhost/tbb/tbb-41/ +#: (content/tbb/tbb-41/contents+en.lrquestion.description) +msgid "" +"Since Disconnect is more of a meta search engine which allows users to " +"choose between different search providers, it fell back to delivering Bing " +"search results which were basically unacceptable quality-wise." +msgstr "" +"因为 Disconnect 是一个允许用户使用不同的搜索提供商的元搜索引擎，它使用 Bing 作为后备，而Bing 的搜索结果质量并不理想。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "* Edit /usr/local/etc/tor/torrc to look like the following:" +msgstr "* 编辑 /usr/local/etc/tor/torrc 文件如下：" + +#: http//localhost/misc/misc-15/ +#: (content/misc/misc-15/contents+en.lrquestion.title) +msgid "How can I donate to Tor Project?" +msgstr "我该怎样向 Tor Project 捐款？" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "* Locate your Tor Browser folder or application." +msgstr "* 打开你 Tor Browser 的文件夹。" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.description) +msgid "" +"The Tor network has over a million daily users, and just over 6000 relays to" +" route all of their traffic, and the load on each server can sometimes cause" +" latency." +msgstr "Tor 的网络有超过一百万个用户，但是只有 6000 多个节点路径来导流数据，每次节点传送都会造成一定的延迟。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.description) +msgid "" +"The low/default setting allows Javascript, but the medium and high levels " +"both block Javascript on HTTP sites." +msgstr "低级和默认设置都允许 JavaScript，但中级和高级则会屏蔽 HTTP 网站的 JavaScript。" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "Something like this might do the trick:" +msgstr "这么做也许能解决你的问题：" + +#: http//localhost/tbb/tbb-14/ +#: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug) +msgid "installing-add-on-extensions-tor-browser" +msgstr "在 Tor Browser 上安装插件" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.title) +msgid "" +"I am having trouble connecting to Tor, and I can’t figure out what’s wrong." +msgstr "无法连接到 Tor，但我不知道发生了什么什么错误。" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"A bridge is just a normal relay with a slightly different configuration." +msgstr "网桥就是有些许不同的中继。" + +#: http//localhost/faq/faq-2/ (content/faq/faq-2/contents+en.lrquestion.title) +#: http//localhost/tbb/tbb-8/ (content/tbb/tbb-8/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.title) +msgid "" +"Our website is blocked by a censor. Can Tor Browser help users access our " +"website?" +msgstr "我的网站被审查机构屏蔽了，Tor Browser 能帮助用户访问我的网站吗？" + +#: http//localhost/tbb/tbb-42/ +#: (content/tbb/tbb-42/contents+en.lrquestion.description) +msgid "" +"Please be sure no other instance of Tor Browser is already running, and that" +" you have extracted Tor Browser in a location that your user has the correct" +" permissions for." +msgstr "请确认你只有一个 Tor Browser 在运行并且你的 Tor Browser 安装在一个有正确权限的文件夹里。" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "* Delete the Tor Browser folder or application." +msgstr "* 删除 Tor Browser 文件夹或者应用程序。" + +#: http//localhost/faq/faq-3/ +#: (content/faq/faq-3/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-14/ +#: (content/tbb/tbb-14/contents+en.lrquestion.description) +msgid "" +"It's strongly discouraged to install new add-ons in Tor Browser, because " +"they can compromise your privacy and security." +msgstr "强烈建议不要在 Tor Browser 上安装新的附加组件，因为这可能会损害你的隐私和安全。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.description) +msgid "" +"For users who want to have Javascript disabled on all HTTP sites by default," +" we recommend changing your Tor Browser's security slider (in the Tor " +"Browser Onion menu under \"Security Settings\")." +msgstr "" +"对于想默认在所有 HTTP 站点上禁用 JavaScript 的用户，我们推荐配置 Tor Browser 的安全滑块。（参见 Tor Browser " +"洋葱菜单的“安全设置”）" + +#: http//localhost/faq/ (content/faq/contents+en.lrtopic.seo_slug) +msgid "faq" +msgstr "常见问题" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"These services use the special-use tld .onion (instead of " +".com,.net,.org,etc..) and are only accessible through the Tor network." +msgstr "这些服务使用特殊的 tld .onion （而不是.com .net .org等）而且这些服务只有在 Tor 网络里可以连接。" + +#: http//localhost/tbb/tbb-7/ (content/tbb/tbb-7/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.title) +msgid "A website I am trying to reach is blocking access over Tor." +msgstr "我视图访问的网站阻止了来自 Tor 网络的连接请求。" + +#: http//localhost/misc/misc-6/ +#: (content/misc/misc-6/contents+en.lrquestion.title) +msgid "Does Tor keep logs?" +msgstr "Tor 会留存日志吗？" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.seo_slug) +msgid "what-is-a-bridge" +msgstr "什么是网桥" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* tor.exe" +msgstr "* Tor .exe" + +#: http//localhost/tormobile/tormobile-4/ +#: (content/tormobile/tormobile-4/contents+en.lrquestion.description) +msgid "" +"There is currently no supported method for running Tor on Windows Phone." +msgstr "目前没有在 Windows Phone上运行的 Tor 的方法。" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.title) +msgid "What is a .onion or what are onion services?" +msgstr "什么是 .onion，或者说什么是洋葱服务？" + +#: http//localhost/misc/misc-12/ +#: (content/misc/misc-12/contents+en.lrquestion.description) +msgid "" +"For sharing files through Tor, <a " +"href=\"https://onionshare.org/\">OnionShare</a> is a good option." +msgstr "" +"通过 Tor 网络分享文件，<a href=\"https://onionshare.org/\">OnionShare " +"洋葱分享</a>是一个不错的选项。" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "No." +msgstr "不要这么做。" + +#: http//localhost/tbb/tbb-25/ +#: (content/tbb/tbb-25/contents+en.lrquestion.seo_slug) +msgid "problem-noscript" +msgstr "问题-没有脚本" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "" +"$ gpg --keyserver keys.gnupg.net --recv " +"A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89" +msgstr "" +"$ gpg --keyserver keys.gnupg.net --recv " +"A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89" + +#: http//localhost/tbb/tbb-32/ +#: (content/tbb/tbb-32/contents+en.lrquestion.seo_slug) +msgid "setting-tor-browser-as-default" +msgstr "设置 Tor Browser 为默认浏览器" + +#: http//localhost/tbb/tbb-15/ +#: (content/tbb/tbb-15/contents+en.lrquestion.description) +msgid "" +"Unfortunately, we don't yet have a version of Tor Browser for ChromeOS." +msgstr "不幸的是，我们目前还没有 ChromeOS 版本的 Tor Browser 。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"新版本提醒\">" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.title) +msgid "" +"The files on my computer have been locked, and someone is demanding I " +"download Tor Browser to pay a ransom for my files!" +msgstr "我电脑上的一些文件被锁住了，有人要求我下载 Tor Browser 来支付赎金赎回文件！" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "$ sudo apt-get install tor deb.torproject.org-keyring" +msgstr "$ sudo apt-get install tor deb.torproject.org-keyring" + +#: http//localhost/misc/misc-12/ +#: (content/misc/misc-12/contents+en.lrquestion.description) +msgid "" +"Many exit nodes are configured to block certain types of file sharing " +"traffic, such as BitTorrent." +msgstr "很多出口节点会设置成阻止 BitTorrent 一类的文件共享服务的流量。" + +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.seo_slug) +msgid "cant-connect-to-tor-browser" +msgstr "无法连接 Tor Browser" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<div class=\"row\">" +msgstr "<div class=\"row\">" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.seo_slug) +msgid "accessing-websites-that-are-only-accessible-over-tor" +msgstr "登录只有通过 Tor 才能访问的网站" + +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"Tor requires an accurate clock to work: please check your time, timezone, " +"and date settings." +msgstr "Tor 需要准确的时间设置：请检查你的时间，时区和日期设置是否正确。" + +#: http//localhost/misc/misc-4/ +#: (content/misc/misc-4/contents+en.lrquestion.description) +msgid "" +"For further details, please see our <a " +"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog" +" post on the subject</a>." +msgstr "" +"更多信息请查阅我们的<a href=\"https://blog. Tor project.org/bit Tor rent-over- " +"Tor -isnt-good-idea\">有关这个项目的博文</a>。" + +#: http//localhost/tbb/tbb-8/ +#: (content/tbb/tbb-8/contents+en.lrquestion.seo_slug) +msgid "website-blocked-by-censor-can-tor-browser-help" +msgstr " Tor Browser 能帮助我访问被审查者封锁的网站吗" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.description) +msgid "" +"Check out a list of all <a " +"href=\"https://www.torproject.org/about/sponsors.html.en\">our " +"sponsors</a> and a series of <a " +"href=\"https://blog.torproject.org/category/tags/form-990\">blog " +"posts</a> on our financial reports." +msgstr "" +"你可以我们的财务报告上查询<a " +"href=\"https://www.torproject.org/about/sponsors.html.en\">捐款人</a>和一系列<a" +" href=\"https://blog. Tor " +"project.org/category/tags/form-990\">日志</a>。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "RunAsDaemon 1" +msgstr "RunAsDaemon 1" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If a SOCKS proxy is required for your network setup, then please make sure " +"you’ve entered your proxy details correctly." +msgstr "如果您的网络连接需要设置 SOCKS 代理，请确认您代理服务器的信息正确。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.seo_slug) +msgid "using-correct-packages" +msgstr "使用正确的安装包" + +#: http//localhost/tbb/tbb-17/ +#: (content/tbb/tbb-17/contents+en.lrquestion.description) +msgid "" +"If you run Tor Browser and another browser at the same time, it won't affect" +" Tor's performance or privacy properties." +msgstr "如果您同时使用 Tor Browser 和其他浏览器，这不会影响 Tor 的安全性和私密性。" + +#: http//localhost/faq/faq-2/ +#: (content/faq/faq-2/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-8/ +#: (content/tbb/tbb-8/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.description) +msgid "" +"Tor Browser can certainly help people access your website in places where it" +" is blocked." +msgstr "Tor Browser 可以帮助人们访问所在地区被封锁的网站。" + +#: http//localhost/tbb/tbb-21/ +#: (content/tbb/tbb-21/contents+en.lrquestion.title) +msgid "How do I view Tor Browser message log?" +msgstr "我该怎么查询 Tor Browser 的消息日志？" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Deutsch (de)" +msgstr "德语" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.seo_slug) +msgid "how-do-i-run-a-middle-or-guard-on-freebsd" +msgstr "我如何在 FreeBSD 上运行中转（或中间）节点" + +#: http//localhost/misc/misc-15/ +#: (content/misc/misc-15/contents+en.lrquestion.description) +msgid "Thank you for your support!" +msgstr "感谢你的支持！" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.description) +msgid "" +"If you need other bridges, you can get them at our <a " +"href=\"https://bridges.torproject.org/\">Bridges website</a>." +msgstr "" +"如果您需要其他的网桥，你可以从<a " +"href=\"https://bridges.torproject.org/\">网桥网站</a>上查询。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Polish (pl)" +msgstr "波兰语" + +#: http//localhost/tbb/tbb-31/ +#: (content/tbb/tbb-31/contents+en.lrquestion.description) +msgid "Tor Browser is currently available on Windows, Linux and OSX." +msgstr "Tor Browser 目前支持 Windows ，macOS 和 GNU/Linux 操作系统。" + +#: http//localhost/faq/faq-4/ +#: (content/faq/faq-4/contents+en.lrquestion.description) +msgid "" +"For <a " +"href=\"https://www.torproject.org/docs/android.html.en\">Android</a>," +" <a href=\"https://guardianproject.info/\">The Guardian " +"Project</a> maintains the Tor-powered apps <a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> and " +"<a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>." +msgstr "" +"<a href=\"https://www. Tor project.org/docs/android.html.en\">Android " +"用户</a>可以通过<a href=\"https://guardianproject.info/\">The " +"Guardian Project</a>维护的<a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a>和<a " +"href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>来使用 Tor " +"网络。" + +#: http//localhost/faq/faq-5/ +#: (content/faq/faq-5/contents+en.lrquestion.seo_slug) +#: http//localhost/misc/misc-13/ +#: (content/misc/misc-13/contents+en.lrquestion.seo_slug) +msgid "use-vpn-with-tor" +msgstr "将 VPN 和 Tor 搭配使用" + +#: http//localhost/tbb/tbb-38/ +#: (content/tbb/tbb-38/contents+en.lrquestion.description) +msgid "" +"However, your service provider or network admins may be able to see that " +"you're connecting to the Tor network, though they won't know what you're " +"doing when you get there." +msgstr "不过你的网络提供商或网络管理员也许可以发现你在使用 Tor，但他们无法知道你浏览的具体网站。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "" +"* Make sure tor starts on boot by running \"sysrc tor_enable=YES\" (as root)" +msgstr "*请确认在开机时启动 Tor 。可以以 root 用户运行 \"sysrc tor_enable=YES\" 来启用此功能。" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.description) +msgid "" +"There may be a temporary connection issue, or the site operators may have " +"allowed it to go offline without warning." +msgstr "有可能是网络连接有出现暂时性阻碍，或者是该网站的管理员在没有提示的情况下关闭了网站。" + +#: http//localhost/misc/misc-10/ +#: (content/misc/misc-10/contents+en.lrquestion.description) +msgid "No, the Tor Project does not offer hosting services." +msgstr "抱歉， Tor Project 不提供虚拟主机服务。" + +#: http//localhost/tbb/tbb-31/ +#: (content/tbb/tbb-31/contents+en.lrquestion.description) +msgid "" +"There is no official version of Tor for iOS yet, though we recommend Onion " +"Browser." +msgstr "目前尚未有官方版本的 iOS 平台的 Tor 。尽管如此，我们仍然推荐使用 Onion Browser。" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.description) +msgid "" +"You can help improve the speed of the network by running your own relay, or " +"encouraging others to do so." +msgstr "你可以通过运行你自己的中继服务器和鼓励他人做同样的事来提高整个 Tor 网络的速度。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "" +"You may see a written indication when Tor Browser opens telling you that an " +"update is available." +msgstr "当 Tor Browser 需要更新时，你可以在打开 Tor Browser 时看见一个更新提示。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "You can update Tor Browser as soon as a new version is released." +msgstr "你可以更新 Tor Browser 至最新版本。" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " +"with a padlock\">" +msgstr "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"有锁型标志的绿色洋葱\">" + +#: http//localhost/tbb/tbb-18/ +#: (content/tbb/tbb-18/contents+en.lrquestion.description) +msgid "" +"Sorry, but there is currently no official support for running Tor Browser on" +" *BSD." +msgstr "抱歉，我们没有对 *BSD 系统官方支持 Tor Browser 。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<div class=\"col-md-6\">" +msgstr "<div class=\"col-md-6\">" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* For OS X" +msgstr "* OS X" + +#: http//localhost/tbb/tbb-21/ +#: (content/tbb/tbb-21/contents+en.lrquestion.description) +msgid "" +"Once you have copied the log, you will be able to paste it into a text " +"editor or email client." +msgstr "当你复制了日志以后，你就可以粘贴到文字编辑器或邮件客户端中里。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "* Run \"pkg install tor\" (as root)." +msgstr "* 在命令窗口以 root 权限执行“pkg install tor ”" + +#: http//localhost/misc/misc-15/ +#: (content/misc/misc-15/contents+en.lrquestion.seo_slug) +msgid "donate-tor-project" +msgstr "向 Tor Project 捐款" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing " +"handshake with directory server. (DONE; DONE; count 10; recommendation warn;" +" host [host] at xxx.xxx.xxx.xx:xxx)" +msgstr "" +"13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing " +"handshake with directory server. (DONE; DONE; count 10; recommendation warn;" +" host [host] at xxx.xxx.xxx.xx:xxx)" + +#: http//localhost/connecting/connecting-1/ +#: (content/connecting/connecting-1/contents+en.lrquestion.seo_slug) +msgid "tor-browser-wont-connect" +msgstr "Tor Browser 无法连接" + +#: http//localhost/onionservices/ +#: (content/onionservices/contents+en.lrtopic.seo_slug) +msgid "onion-services" +msgstr "洋葱服务" + +#: http//localhost/onionservices/ +#: (content/onionservices/contents+en.lrtopic.title) +msgid "Onion Services" +msgstr "洋葱服务" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "" +"If law enforcement becomes interested in traffic from your exit relay, it's " +"possible that officers will seize your computer." +msgstr "如果司法部门察觉了你出口节点的数据流量，他们可能会没收你的电子设备。" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"See our page on <a href=\"https://www.torproject.org/docs/pluggable-" +"transports.html.en\">pluggable transports</a> for more info." +msgstr "" +"请浏览<a href=\"https://www. Tor project.org/docs/pluggable-" +"transports.html.en\">可插拔传输</a>获取更多信息。" + +#: http//localhost/tormobile/tormobile-2/ +#: (content/tormobile/tormobile-2/contents+en.lrquestion.title) +msgid "Who is the Guardian Project?" +msgstr "什么是 Guardian Project ?" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.description) +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.description) +msgid "" +"If you are still unable to connect to the onion service, please try again " +"later." +msgstr "如果你仍然无法访问这个洋葱服务，请稍后重试。" + +#: http//localhost/tormobile/tormobile-3/ +#: (content/tormobile/tormobile-3/contents+en.lrquestion.description) +msgid "" +"However, Apple requires browsers on iOS to use something called Webkit, " +"which prevents Onion Browser from having the same privacy protections as Tor" +" Browser." +msgstr "" +"但是，苹果要求所有在 iOS 运行的浏览器使用 Webkit ，这会使 Onion Browser 不能提供和 Tor Browser 相同的隐私保护。" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.description) +msgid "They need to be configured separately to use Tor." +msgstr "需要单独配置来使用 Tor。" + +#: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.seo_slug) +msgid "tor-browser" +msgstr "Tor Browser" + +#: http//localhost/https/ (content/https/contents+en.lrtopic.seo_slug) +msgid "https" +msgstr "https" + +#: http//localhost/tbb/tbb-41/ +#: (content/tbb/tbb-41/contents+en.lrquestion.seo_slug) +msgid "why-is-tor-using-duckduckgo" +msgstr "为什么 Tor 使用 DuckDuckGo" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"You should see one of these common log errors (look for the following lines " +"in your Tor log):" +msgstr "您应该能够在 Tor 日志中发现这些常见问题（请在 Tor 日志里寻找如下所示的错误）:" + +#: http//localhost/tbb/tbb-3/ +#: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug) +msgid "tell-which-website-are-visited-while-using-tor-browser" +msgstr "告知 Tor Browser 的浏览记录" + +#: http//localhost/faq/faq-2/ +#: (content/faq/faq-2/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-8/ +#: (content/tbb/tbb-8/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.description) +msgid "" +"Most of the time, simply downloading the <a " +"href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " +"Browser</a> and then using it to navigate to the blocked site will " +"allow access." +msgstr "" +"大多数时候，只需下载<a href=\"https://www. Tor project.org/download/download-" +"easy.html.en\"> Tor Browser</a>，您就可以使用它去访问被屏蔽的网站。" + +#: http//localhost/misc/misc-2/ +#: (content/misc/misc-2/contents+en.lrquestion.description) +msgid "" +"We hate that there are some people who use Tor to do terrible things, but we" +" can't do anything to get rid of them without also undermining the human " +"rights activists, journalists, abuse survivors, and other people who use Tor" +" for good things." +msgstr "" +"我们厌恶用 Tor 做糟糕的事情的人，但是我们并不能在剔除他们的同时，不伤害到人权活动者，记者，虐待后的幸存者们，以及其他用 Tor 做好事的人们。" + +#: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug) +msgid "operators" +msgstr "操作者" + +#: http//localhost/tbb/tbb-17/ +#: (content/tbb/tbb-17/contents+en.lrquestion.title) +msgid "Is it safe to run Tor Browser and another browser at the same time?" +msgstr "同时运行 Tor Browser 和其他的浏览器安全吗?" + +#: http//localhost/gettor/gettor-1/ +#: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) +msgid "" +"If you can't download Tor through our <a " +"href=\"https://www.torproject.org\">website</a>, you can get a copy " +"of Tor delivered to you via GetTor." +msgstr "" +"如果无法通过我们的 <a href=\"https://www. Tor project.org\">网站</a>下载 " +"Tor，你可以通过 GetTor 获取 Tor。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.description) +msgid "" +"We configure NoScript to allow JavaScript by default in Tor Browser because " +"many websites will not work with JavaScript disabled." +msgstr "因为禁用 JavaScript 会让很多网站无法工作， Tor Browser 内置的 NoScript 默认允许 JavaScript。" + +#: http//localhost/faq/faq-2/ +#: (content/faq/faq-2/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-8/ +#: (content/tbb/tbb-8/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.description) +msgid "" +"In places where there is heavy censorship we have a number of censorship " +"circumvention options available, including <a " +"href=\"https://www.torproject.org/docs/pluggable-" +"transports.html.en\">pluggable transports</a>." +msgstr "" +"我们在审查严重的地区提供了诸如<a href=\"https://www. Tor project.org/docs/pluggable-" +"transports.html.en\">可插拔传输</a>等一系列选项。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "* Run \"service tor start\" (as root)" +msgstr "* 以 root 用户运行 \"service tor start\"" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "* Run \"apt-get install tor\" (as root)." +msgstr "* 以 root 用户运行 \"apt-get install tor\"" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" +msgstr "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Vietnamese (vi)" +msgstr "越南语" + +#: http//localhost/tbb/tbb-36/ +#: (content/tbb/tbb-36/contents+en.lrquestion.seo_slug) +msgid "run-multible-instances-of-tor-browser" +msgstr "同时运行多个 Tor Browser" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.seo_slug) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.seo_slug) +msgid "having-trouble-connecting-to-tor" +msgstr "连接 Tor 网络出现了问题" + +#: http//localhost/misc/misc-4/ +#: (content/misc/misc-4/contents+en.lrquestion.title) +msgid "Can I use Tor with BitTorrent?" +msgstr "我能在 Tor 网络中使用 BitTorrent 吗？" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.description) +msgid "" +"Tor is funded by a number of different sponsors including US federal " +"agencies, private foundations, and individual donors." +msgstr "" +"Tor 有不同的资金支持赞助，包括美国中央政府部分机构（译者加：应该是搞笑的，Tor 被列为国家安全局重点监控对象-----" +"因为无法监控），私有募款机构和个人。" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.description) +msgid "" +"Some bridges are built in to Tor Browser, and you can use those bridges by " +"choosing \"configure\" (then following the prompts) in the Tor Launcher " +"window that pops up when you open Tor Browser for the first time." +msgstr "" +"有一些网桥是 Tor Browser 内置的，在第一次启动 Tor Browser 时你可以通过点击 Tor Launcher " +"中的“设置”（并遵循提示）来使用这些网桥。" + +#: http//localhost/tbb/tbb-24/ +#: (content/tbb/tbb-24/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-25/ +#: (content/tbb/tbb-25/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-26/ +#: (content/tbb/tbb-26/contents+en.lrquestion.description) +msgid "" +"If you believe this is a Tor Browser issue, please report it on our <a" +" href=\"https://trac.torproject.org/\">bug tracker</a>." +msgstr "" +"如果你相信这是浏览器的问题，请你报告给<a href=\"https://trac. Tor project.org/\">Bug " +"跟踪平台</a>。" + +#: http//localhost/tbb/tbb-18/ +#: (content/tbb/tbb-18/contents+en.lrquestion.title) +msgid "Is there support for *BSD?" +msgstr "有对 *BSD 的支持吗?" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.title) +msgid "I can’t connect to Tor Browser, is my network censored?" +msgstr "无法连接 Tor，我的网络被审查了吗？" + +#: http//localhost/tbb/tbb-32/ +#: (content/tbb/tbb-32/contents+en.lrquestion.description) +msgid "" +"There is currently no supported method for setting Tor Browser as your " +"default browser." +msgstr "目前没有设置 Tor Browser 为默认浏览器的方法。" + +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.description) +msgid "Set your security to \"Standard\"." +msgstr "把安全等级设置为“标准”。" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "" +"The default location on Windows is the Desktop; on macOS it is the " +"Applications folder (on macOS, you have to move it into the Applications " +"folder when you complete the installation process)." +msgstr "Windows 中的默认位置是桌面，macOS 中位于应用程序文件夹（你需要在安装完毕后把浏览器移动到应用程序文件夹来运行。）" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.seo_slug) +msgid "make-tor-faster" +msgstr "让 Tor 更快" + +#: http//localhost/misc/misc-8/ +#: (content/misc/misc-8/contents+en.lrquestion.title) +msgid "Can I use the Tor logo in my product?" +msgstr "我能将 Tor 的图标用于我的产品中吗？" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If you see lines like this in your Tor log, it means that Tor failed to " +"complete a TLS handshake with the directory authorities." +msgstr "如果你在 Tor 日志里看见这句话，这意味着 Tor 和目录服务器无法完成 TLS 握手。" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.description) +msgid "" +"For more information about bridges, see the <a href=\"https://tb-" +"manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a>." +msgstr "" +"关于网桥的更多信息请参阅 <a href=\"https://tb-manual. Tor project.org/en-" +"US/bridges.html\">Tor Browser 用户手册</a>。" + +#: http//localhost/tbb/tbb-12/ +#: (content/tbb/tbb-12/contents+en.lrquestion.description) +msgid "" +"We don’t think Flash is safe to use in any browser — it's a very insecure " +"piece of software that can easily compromise your privacy or serve you " +"malware." +msgstr "我们认为无论是什么浏览器 Flash 都是是极不安全的 —— 它可以轻易盗取你的个人情报或者给你安装恶意软件。" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.description) +msgid "You can access these websites by using Tor Browser." +msgstr "您可以用 Tor Browser 访问这些网站。" + +#: http//localhost/tormobile/tormobile-1/ +#: (content/tormobile/tormobile-1/contents+en.lrquestion.title) +msgid "Can I run Tor on an Android device?" +msgstr "我能在 Android 设备上使用 Tor 吗？" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "#RelayBandwidthBurst 100 MBytes" +msgstr "#RelayBandwidthBurst 100 MBytes" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "" +"Consider if you'd like to switch to the <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">Reduced" +" exit policy</a>." +msgstr "" +"在切换到<a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy\">严格出口政策</a>时请稍加考虑。" + +#: http//localhost/faq/faq-1/ +#: (content/faq/faq-1/contents+en.lrquestion.seo_slug) +msgid "will-anyone-be-able-to-tell-which-website-i-visit" +msgstr "有人会知道我在访问什么网站吗" + +#: http//localhost/tbb/tbb-15/ +#: (content/tbb/tbb-15/contents+en.lrquestion.seo_slug) +#: http//localhost/tbb/tbb-5/ +#: (content/tbb/tbb-5/contents+en.lrquestion.seo_slug) +msgid "download-tor-browser-chromeos" +msgstr "我能为 ChromeOS 下载 Tor Browser 吗" + +#: http//localhost/https/ (content/https/contents+en.lrtopic.title) +msgid "HTTPS" +msgstr "HTTPS" + +#: http//localhost/tbb/tbb-5/ (content/tbb/tbb-5/contents+en.lrquestion.title) +msgid "" +"Can I still use another browser, like Chrome or Firefox, when I am using Tor" +" Browser?" +msgstr "我能在使用 Tor Browser 时使用其它的浏览器吗（例如 Chrome 或 Firefox）？" + +#: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title) +msgid "Tor Mobile" +msgstr "在移动设备上使用 Tor" + +#: http//localhost/misc/misc-12/ +#: (content/misc/misc-12/contents+en.lrquestion.title) +msgid "How can I share files anonymously through Tor?" +msgstr "我如何使用 Tor 匿名的分享文件？" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* tor.real" +msgstr "* tor.real" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "##### Common log error #4: Clock skew" +msgstr "##### Common log error #4: Clock skew" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Both options are located in the Menu, but you can also access the New " +"Circuit option inside the site information menu, in the URL bar." +msgstr "两个选项都在菜单中，你也可以从地址栏的网站信息菜单中选择“新的 Tor 线路”选项。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "Using bridges will likely fix this." +msgstr "使用网桥可能会解决这个问题。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "## If you control multiple relays, include them in the family" +msgstr "## 如果你管理多个中继，请将它们包含在一起" + +#: http//localhost/misc/misc-8/ +#: (content/misc/misc-8/contents+en.lrquestion.description) +msgid "" +"You can read all about that on our <a " +"href=\"https://www.torproject.org/docs/trademark-faq.html\">Trademark faq " +"page</a>." +msgstr "" +"您可以在<a href=\"https://www. Tor project.org/docs/trademark-" +"faq.html\">商标问答界面</a>了解一切有关我们商标的事情。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* فارسى (fa)" +msgstr "阿拉伯语" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug) +msgid "tor-browser-protecting-other-apps" +msgstr "Tor Browser 保护其它应用" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.description) +msgid "Using Tor Browser can sometimes be slower than other browsers." +msgstr "使用 Tor Browser 有时会比其他浏览器慢。" + +#: http//localhost/misc/misc-4/ +#: (content/misc/misc-4/contents+en.lrquestion.seo_slug) +msgid "tor-bittorrent" +msgstr "Tor 和 BitTorrent" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "" +"* Make sure your clock, date, and timezone are set correctly. Install the " +"ntp or openntpd (or similar) package to keep it that way." +msgstr "* 请确认你的时钟，日期和时区设置正确。你可以安装 ntp / openntpd 等软件来确保时间正确。" + +#: http//localhost/faq/faq-4/ (content/faq/faq-4/contents+en.lrquestion.title) +#: http//localhost/tbb/tbb-31/ +#: (content/tbb/tbb-31/contents+en.lrquestion.title) +msgid "Which platforms is Tor Browser available for?" +msgstr "Tor Browser 支持哪些平台？" + +#: http//localhost/tormobile/tormobile-1/ +#: (content/tormobile/tormobile-1/contents+en.lrquestion.description) +msgid "Tor on Android is provided by The Guardian Project." +msgstr "Guardian Project 提供了 Android 上的 Tor。" + +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"If you are unable to connect to an onion service, please see <a " +"href=\"/#onionservices-3\">I cannot reach X.onion!</a>" +msgstr "如果你无法连接洋葱服务，请参阅 <a href=\"/#onionservices-3\">我无法访问 x.onion！</a>" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" +msgstr "" +"19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"Several countries, including China and Iran, have found ways to detect and " +"block connections to Tor bridges." +msgstr "一些国家，包括中国和伊朗，已经发现了检测和屏蔽 Tor 网桥的方法。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "Then paste the Tor log into a text file or other document." +msgstr "然后粘贴 Tor 日志到文本文件或者其他文档格式中。" + +#: http//localhost/misc/misc-6/ +#: (content/misc/misc-6/contents+en.lrquestion.description) +msgid "" +"We do take some safe measurements of how the network functions, which you " +"can check out at <a href=\"https://metrics.torproject.org/\">Tor " +"Metrics</a>." +msgstr "" +"我们会存留一些关于网络功能的日志，用于提高安全性。您可以在<a " +"href=\"https://metrics.torproject.org/\"> Tor Metrics</a>中查看到。" + +#: http//localhost/tbb/tbb-26/ +#: (content/tbb/tbb-26/contents+en.lrquestion.description) +msgid "" +"Please see the <a href=\"https://www.eff.org/https-" +"everywhere/faq\">HTTPS Everywhere FAQ</a>." +msgstr "" +"请参阅 <a href=\"https://www.eff.org/https-everywhere/faq\">HTTPS " +"Everywhere 的常见问题 </a>。" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.seo_slug) +msgid "someone-asks-to-download-tor-browser-to-unlock-my-files" +msgstr "有人要求我下载 Tor Browser 来解锁我的文件" + +#: http//localhost/tormobile/tormobile-2/ +#: (content/tormobile/tormobile-2/contents+en.lrquestion.seo_slug) +msgid "who-is-the-guardian-project" +msgstr "Guardian Project 是？" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.description) +msgid "" +"Most users would give up on Tor entirely if we disabled Javascript by " +"default because it would cause so many problems for them." +msgstr "默认禁用 JavaScript 造成的不便过于严重，也许会让大多数用户直接放弃使用 Tor 。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If a SOCKS proxy is not required, or you’re not sure, please try connecting" +" to the Tor network without a SOCKS proxy." +msgstr "如果您的系统不需要代理，或者您不敢肯定，请尝试直接连接 Tor 网络。" + +#: http//localhost/tbb/tbb-38/ +#: (content/tbb/tbb-38/contents+en.lrquestion.description) +msgid "When using Tor Browser, no one can see the websites that you visit." +msgstr "使用 Tor Browser 时，没人能看见你在浏览的网站。" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.description) +msgid "" +"Tor Browser often makes your connection appear as though it is coming from " +"an entirely different part of the world." +msgstr "Tor Browser 会让你的网络活动看起来像是来自于世界各个不同地区的网络连接。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"This option is useful if the exit relay you are using is unable to connect " +"to the website you require, or is not loading it properly." +msgstr "这个选项在出口节点无法访问你请求的网站或显示不正常时会有用。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "* Make sure your clock, date, and timezone are set correctly." +msgstr "* 请确认你的时钟，日期和时区设置正确。" + +#: http//localhost/tormessenger/tormessenger-1/ +#: (content/tormessenger/tormessenger-1/contents+en.lrquestion.title) +msgid "Does Tor Project make an application for private chat?" +msgstr "Tor Project 有开发私密聊天软件吗？" + +#: http//localhost/tormobile/tormobile-1/ +#: (content/tormobile/tormobile-1/contents+en.lrquestion.description) +msgid "" +"More information can be found on the <a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> and " +"<a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a> " +"web pages." +msgstr "" +"你可以点击<a " +"href=\"https://guardianproject.info/apps/orbot/\">Orbot</a>和<a " +"href=\"https://guardianproject.info/apps/orfox/\">Orfox</a>网页了解更多信息。" + +#: http//localhost/tbb/tbb-21/ +#: (content/tbb/tbb-21/contents+en.lrquestion.description) +msgid "" +"If Tor Browser is already open, click on the Torbutton icon (the small green" +" onion at the top-left of the screen), then \"Open Network Settings\", then " +"\"Copy Tor Log To Clipboard\"." +msgstr "" +"如果 Tor Browser 已开启，点击 TorButton （屏幕左上角的绿色洋葱图标），然后点击“打开网络设置”- “复制 Tor " +"日志到剪贴板”。" + +#: http//localhost/tbb/tbb-9/ +#: (content/tbb/tbb-9/contents+en.lrquestion.description) +msgid "" +"We strongly recommend against using Tor in any browser other than Tor " +"Browser." +msgstr "我们强烈不推荐把 Tor 和 Tor Browser 以外的浏览器搭配使用。" + +#: http//localhost/faq/faq-5/ +#: (content/faq/faq-5/contents+en.lrquestion.description) +#: http//localhost/misc/misc-13/ +#: (content/misc/misc-13/contents+en.lrquestion.description) +msgid "" +"You can find more detailed information about Tor + VPN at <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our " +"wiki</a>." +msgstr "" +"了解关于 Tor 与 VPN 组合使用等更多信息，请访问<a href=\"https://trac. Tor " +"project.org/projects/ Tor /wiki/doc/TorPlusVPN\">我们的 wiki</a>。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "" +"<h4 class=\"card-title\">This visualization shows what information is " +"visible to eavesdroppers with and without Tor Browser and HTTPS " +"encryption.</h4>" +msgstr "" +"<h4 class=\"card-title\">这个可视化实例展示了窃听者在不同的情况（网站是否支持 HTTPS ，是否在使用 Tor " +"Browser）时会看到哪些信息。</h4>" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<img class=\"card-img-top\" src=\"/static/images/image6.png\" alt=\"https\">" +msgstr "<img class=\"card-img-top\" src=\"/static/images/image6.png\" alt=\"https\">" + +#: http//localhost/misc/misc-12/ +#: (content/misc/misc-12/contents+en.lrquestion.description) +msgid "" +"BitTorrent in specific is <a href=\"https://blog.torproject.org" +"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a>." +msgstr "" +"<a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-" +"idea\">即使通过 Tor 网络，BitTorrent 也不是匿名的</a>。" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.description) +msgid "" +"Choose a directory location that you'll remember easily, and once the " +"download finishes you should see a Tor Browser folder there." +msgstr "选择一个你能简单记住的目录，下载完成后你能在选择的目录中看到 Tor Browser 文件夹。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.title) +msgid "How do I update Tor Browser?" +msgstr "我如何更新Tor Browser?" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "This should fix the issues you're experiencing." +msgstr "这应该能解决你遇到的问题。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +msgid "" +"Look for a log entry in /var/log/syslog such as \"Self-testing indicates " +"your ORPort is reachable from the outside. Excellent.\"" +msgstr "" +"查找 /var/log/syslog 中例如 \"Self-testing indicates your ORPort is reachable " +"from the outside. Excellent.\" 这样的日志记录。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.title) +msgid "How do I run a middle or guard relay on FreeBSD or HardenedBSD?" +msgstr "我如何在 FreeBSD 或 HardenedBSD 上运行中转或中间节点？" + +#: http//localhost/tbb/tbb-25/ +#: (content/tbb/tbb-25/contents+en.lrquestion.title) +msgid "I'm having a problem with NoScript." +msgstr "我遇到 NoScript 的使用问题。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.title) +msgid "Why does Tor Browser ship with Javascript enabled?" +msgstr "为什么 Tor Browser 默认启用 JavaScript ?" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.seo_slug) +msgid "tor-funding" +msgstr "Tor -资金" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "Tor browser will install the updates." +msgstr "Tor Browser 会安装更新。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "" +"* Do not use the packages in Ubuntu's repositories. They are not reliably " +"updated. If you use them, you will miss important stability and security " +"fixes." +msgstr "* 不要使用 Ubuntu 仓库中的包，它们未得到可靠更新。如果您使用它们，您可能会错过重要的稳定性和安全性修复。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Português (pt-BR)" +msgstr "* 葡萄牙语" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Tor Browser has two ways to change your relay circuit — \"New Identity\" and" +" \"New Tor Circuit for this Site\"." +msgstr "Tor Browser 有两种方法改变你的中继线路 —— “新身份”和“为该站点使用新 Tor 线路”。" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.description) +msgid "" +"If you can't find it in either of those folders, download it again and look " +"for the prompt that asks you to choose a directory to download it in." +msgstr "如果你在文件夹中找不到，请再次下载并注意询问你下载位置的提示。" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.seo_slug) +msgid "run-exit-from-home" +msgstr "在家中运行 Tor 出口节点" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.title) +msgid "Should I run an exit relay from home?" +msgstr "我应该在家里运行 Tor 出口节点吗？" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.seo_slug) +msgid "updating-tor-browser" +msgstr "更新 Tor Browser" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "" +"* Review our <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorExitGuidelines\">Exit" +" relay guidelines</a>" +msgstr "" +"* 查阅我们的 <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorExitGuidelines\">出口节点政策</a>" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "" +"$ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -" +msgstr "" +"$ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -" + +#: http//localhost/tbb/tbb-9/ +#: (content/tbb/tbb-9/contents+en.lrquestion.description) +msgid "" +"Using Tor in another browser can leave you vulnerable without the privacy " +"protections of Tor Browser." +msgstr "在其它浏览器中使用 Tor 可能会使你置于没有 Tor Browser 提供的隐私保护的风险中。" + +#: http//localhost/tbb/tbb-17/ +#: (content/tbb/tbb-17/contents+en.lrquestion.seo_slug) +msgid "run-tor-browser-and-different-browser" +msgstr "运行 Tor Browser 和不同的浏览器" + +#: http//localhost/faq/faq-3/ +#: (content/faq/faq-3/contents+en.lrquestion.seo_slug) +msgid "install-add-on-extension-tor-browser" +msgstr "在 Tor Browser 中安装附加组件" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" +msgstr "" +"2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150" + +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"Please take a strong stance in favor of digital privacy and internet " +"freedom, and allow Tor users access to xyz.com. Thank you.\"" +msgstr "请采取强硬立场支持数字隐私和互联网自由，以及允许 Tor 用户访问 xyz.com，谢谢。”" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.seo_slug) +msgid "how-do-i-run-a-obfs4-bridge-debian" +msgstr "我如何在 Debian 中使用 obfs4 网桥" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "* Edit /etc/tor/torrc to look like the following:" +msgstr "* 编辑 /etc/tor/torrc：" + +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.title) +msgid "" +"I’m having trouble using features on Facebook, Twitter, or some other " +"website when I’m using Tor Browser." +msgstr "我用 Tor Browser 访问 Facebook、Twitter 之类的网站时遇到了问题。" + +#: http//localhost/misc/misc-1/ +#: (content/misc/misc-1/contents+en.lrquestion.seo_slug) +msgid "tracing-tor-user" +msgstr "追踪 Tor 用户" + +#: http//localhost/tbb/tbb-20/ +#: (content/tbb/tbb-20/contents+en.lrquestion.seo_slug) +msgid "tor-browser-will-not-connect-no-censorship" +msgstr "Tor Browser 在没有审查时仍然无法连接" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If you see lines like these in your Tor log, it means you are failing to " +"connect to a SOCKS proxy." +msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" + +#: http//localhost/tbb/tbb-35/ +#: (content/tbb/tbb-35/contents+en.lrquestion.description) +msgid "" +"The best thing to do in these cases is to contact the website owners, and " +"inform them that their CAPTCHAs are preventing users such as yourself from " +"using their services." +msgstr "最有效的方法往往是联系网站管理员，告诉他们验证码给像你一样的用户带来的不便。" + +#: http//localhost/tbb/tbb-42/ +#: (content/tbb/tbb-42/contents+en.lrquestion.title) +msgid "Why does my Tor Browser say something about Firefox not working?" +msgstr "为什么 Tor Browser 会提示“Firefox 没有响应“？" + +#: http//localhost/tbb/tbb-24/ +#: (content/tbb/tbb-24/contents+en.lrquestion.title) +msgid "I'm having a problem with DuckDuckGo." +msgstr "我使用 DuckDuckGo 时遇到了问题。" + +#: http//localhost/tbb/tbb-9/ (content/tbb/tbb-9/contents+en.lrquestion.title) +msgid "Can I use Tor with a browser besides Tor Browser?" +msgstr "我能用其他的浏览器使用 Tor 服务吗？" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "ExitPolicy reject *:*" +msgstr "ExitPolicy reject *:*" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "BridgeRelay 1" +msgstr "BridgeRelay 1" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"* Look for a log entry in /var/log/syslog such as \"Self-testing indicates " +"your ORPort is reachable from the outside. Excellent.\"" +msgstr "" +"* 查找 /var/log/syslog 中例如 \"Self-testing indicates your ORPort is reachable " +"from the outside. Excellent.\" 这样的日志记录。" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.description) +msgid "" +"That said, Tor is much faster than it used to be and you may not actually " +"notice any change in speed from other browsers." +msgstr "也就是说， Tor 比以前快的多了，你未必会注意到和其它浏览器相比的速度变化。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Türkçe (tr)" +msgstr "* 土耳其语" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake " +"with first hop" +msgstr "" +"11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake " +"with first hop" + +#: http//localhost/connecting/ +#: (content/connecting/contents+en.lrtopic.seo_slug) +msgid "connecting-to-tor" +msgstr "连接 Tor" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" +msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.description) +msgid "" +"But please consider that our software is used every day for a wide variety " +"of purposes by human rights activists, journalists, domestic violence " +"survivors, whistleblowers, law enforcement officers, and many others. " +"Unfortunately, the protection that our software can provide to these groups " +"of people can also be abused by criminals and malware authors." +msgstr "" +"但请考虑我们的软件每天都被人权活动家，记者，国内暴乱幸存者，举报人，执法人员和其他许多人用于各种目的。不幸的是，我们的软件在保护这些人的同时也会被罪犯和恶意软件作者滥用。" + +#: http//localhost/misc/misc-8/ +#: (content/misc/misc-8/contents+en.lrquestion.seo_slug) +msgid "using-tor-logo" +msgstr "使用 Tor 的标志" + +#: http//localhost/tbb/tbb-35/ +#: (content/tbb/tbb-35/contents+en.lrquestion.seo_slug) +msgid "get-rid-of-captchas" +msgstr "摆脱验证码" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.description) +msgid "" +"The rest of your circuit changes with every new website you visit, and all " +"together these relays provide the full privacy protections of Tor." +msgstr "其余的中继会在你每次访问新网站时改变，这三个 Tor 中继会一起提供完整的隐私保护。" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.seo_slug) +msgid "first-address-relay-circuit" +msgstr "中转节点的地址" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" +msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"为此站点使用新" +" Tor 线路\">" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "" +"On Linux, there is no default location, however the folder will be named " +"\"tor-browser_en-US\" if you are running the English Tor Browser." +msgstr "" +"在 Windows 系统中默认是在桌面；在 Mac OS X 中则是应用程序文件夹；而在 Linux 系统中则没有默认路径，但是若您的 Tor " +"Browser是英文版的话，那目录的名称会是“ Tor -browser_en-US”。" + +#: http//localhost/misc/ (content/misc/contents+en.lrtopic.seo_slug) +msgid "misc" +msgstr "misc" + +#: http//localhost/tbb/tbb-42/ +#: (content/tbb/tbb-42/contents+en.lrquestion.description) +msgid "" +"Tor Browser is built using <a href=\"https://www.mozilla.org/en-" +"US/firefox/organizations/\">Firefox ESR</a>, so errors regarding " +"Firefox may occur." +msgstr "" +"Tor Browser 基于 <a href=\"https://www.mozilla.org/en-" +"US/firefox/organizations/\">Firefox ESR</a> 开发，所以也许会遇到 Firefox 的错误。" + +#: http//localhost/tbb/tbb-33/ +#: (content/tbb/tbb-33/contents+en.lrquestion.description) +msgid "" +"If you'd like to become a relay, please see our <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " +"Relay Guide</a>." +msgstr "" +"如果你希望成为一个 Tor 中继，请参阅<a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " +"中继指南</a>。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.seo_slug) +msgid "can-eavesdroppers-see-information-i-share" +msgstr "窃听者能看到我分享的信息吗" + +#: http//localhost/tbb/tbb-32/ +#: (content/tbb/tbb-32/contents+en.lrquestion.title) +msgid "Can I set Tor Browser as my default browser?" +msgstr "我可以设置 Tor Browser为默认浏览器吗？" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"Please make sure your clock is set accurately, including the correct " +"timezone. Then restart Tor." +msgstr "请确认您的时间设置是正确的，包括正确的时区。然后重新启动Tor。" + +#: http//localhost/faq/faq-2/ +#: (content/faq/faq-2/contents+en.lrquestion.seo_slug) +msgid "can-tor-help-users-access-website" +msgstr "Tor 能否帮助用户访问网站" + +#: http//localhost/tbb/tbb-1/ +#: (content/tbb/tbb-1/contents+en.lrquestion.description) +msgid "" +"If your issue is not listed, please file a <a " +"href=\"https://trac.torproject.org\">bug report</a> about what you're" +" experiencing." +msgstr "" +"如果你的问题不在列表中，请提交一个你遇到的问题的 <a href=\"https://trac.torproject.org\">bug " +"报告</a>。" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.description) +msgid "We are so sorry, but you have been infected with malware." +msgstr "我们很抱歉，但这是您被恶意软件感染的现象。" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"The best success we've had in getting sites to unblock Tor users is getting " +"users to contact the site administrators directly." +msgstr "我们能让网站解封 Tor 用户的最成功的手段是让用户直接联系网站管理员" + +#: http//localhost/tbb/tbb-40/ +#: (content/tbb/tbb-40/contents+en.lrquestion.title) +msgid "Does Tor Browser use a different circuit for each website?" +msgstr "Tor Browser 是否为每个网站使用不同的线路？" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "" +"Please note that some antivirus clients, like Kaspersky, may also be " +"blocking Tor at the firewall level." +msgstr "请注意 Kaspersky 一类的防病毒软件可能会在防火墙等级封锁 Tor。" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.title) +msgid "To use GetTor via Twitter." +msgstr "通过 Twitter 使用 GetTor。" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "* Run \"service tor reload\" (as root)." +msgstr "* 以 root 用户运行 \"service tor reload\"" + +#: http//localhost/faq/faq-1/ +#: (content/faq/faq-1/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-3/ +#: (content/tbb/tbb-3/contents+en.lrquestion.description) +msgid "Tor Browser prevents people from knowing the websites you visit." +msgstr "Tor Browser防止人们获知您访问过的网站。" + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.description) +msgid "" +"If the outcome you want is simply to be able to access resources that are " +"only available in one country, you may want to consider using a VPN instead " +"of using Tor." +msgstr "如果你只想访问只在某些国家或地区提供的服务，你可能更应该去使用 VPN 而不是 Tor。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "#RelayBandwidthRate 30 MBytes" +msgstr "#RelayBandwidthRate 30 MBytes" + +#: http//localhost/tbb/tbb-4/ +#: (content/tbb/tbb-4/contents+en.lrquestion.description) +msgid "" +"A lot of work has been put into making the Tor Browser, including the use of" +" extra patches to enhance privacy and security." +msgstr "Tor Browser 做了很多工作，例如加入强化隐私和安全的补丁。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<img class=\"card-img-top\" src=\"/static/images/image2.png\" alt=\"https\">" +msgstr "<img class=\"card-img-top\" src=\"/static/images/image2.png\" alt=\"https\">" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +msgid "" +"If you are unable to connect to an onion service, please see <a " +"href=\"#onionservices-3\">I cannot reach X.onion!</a>" +msgstr "" +"如果你平时只在某个特定的国家使用他们的服务，从其他国家进行访问时你的账号可能就会被冻结。如无法连接 onion 服务，请参阅 <a " +"href=\"/#onionservices-3\">无法连接 x.onion！</a>" + +#: http//localhost/tbb/tbb-33/ +#: (content/tbb/tbb-33/contents+en.lrquestion.description) +msgid "" +"This means that your computer will not be used to route traffic for others." +msgstr "这意味着你的电脑不会用于中继其他人的流量。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"* After your relay connects to the network, it will try to determine whether" +" the ports you configured are reachable from the outside." +msgstr "* 你的中继连接到网络以后，它将尝试确定您配置的端口是否可从外部访问。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* English (en-US)" +msgstr "英语（美国）" + +#: http//localhost/tbb/tbb-1/ +#: (content/tbb/tbb-1/contents+en.lrquestion.seo_slug) +msgid "most-common-issues-latest-stable-tor-browser" +msgstr "常见于最新稳定版本的 Tor Browser 的问题" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.description) +msgid "" +"We are always seeking more diversity in our funding sources, especially from" +" foundations and individuals." +msgstr "我们一直在寻求更多的资金来源，尤其是基金会和个人。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "###### Common log error #1: Proxy connection failure" +msgstr "##### 常见错误#1: 代理连接失败" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.description) +msgid "" +"We feel that talking openly about our funders and funding model is the best " +"way to maintain trust with our community." +msgstr "我们认为让社区对我们保持信任的最佳方式就是开发讨论赞助者和资助模型。" + +#: http//localhost/tbb/tbb-9/ +#: (content/tbb/tbb-9/contents+en.lrquestion.seo_slug) +msgid "using-tor-with-a-browser-besides-tor-browser" +msgstr "在非 Tor Browser 的浏览器上使用 Tor" + +#: http//localhost/tbb/tbb-6/ +#: (content/tbb/tbb-6/contents+en.lrquestion.description) +msgid "" +"Unfortunately, there is no supported way to make Tor Browser your default " +"browser." +msgstr "目前没有设置 Tor Browser 为默认浏览器的方法。" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.description) +msgid "" +"The Tor Project did not create this malware. The malware authors are asking " +"you to download Tor Browser presumably to contact them anonymously with the " +"ransom they're demanding from you." +msgstr "Tor Project 并不是这个恶意软件的作者。恶意软件的作者希望你使用 Tor Browser 来匿名的联系他们来交付赎金。" + +#: http//localhost/faq/faq-1/ (content/faq/faq-1/contents+en.lrquestion.title) +#: http//localhost/tbb/tbb-3/ (content/tbb/tbb-3/contents+en.lrquestion.title) +msgid "" +"When I use Tor Browser, will anyone be able to tell which websites I visit?" +msgstr "当我使用 Tor Browser 时，其他人是否能知道我曾经访问过哪些网站？" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Selecting it will close all your tabs and windows, clear all private " +"information such as cookies and browsing history, and use new Tor circuits " +"for all connections." +msgstr "" +"运行此功能将会关闭所有已经打开的浏览器窗口及标签页，清除所有的浏览器 Cookie 与历史记录等个人信息，并且为后续所有的网络连接创建新的洋葱路由回路。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "##### New Identity" +msgstr "##### 新身份" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.title) +msgid "Does using Tor Browser protect other applications on my computer?" +msgstr "使用 Tor Browser 能够保护我电脑上的其他应用吗？" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.description) +msgid "" +"It is a fast and stable relay that remains the first one in your circuit for" +" 2-3 months in order to protect against a known anonymity-breaking attack." +msgstr "它是一个快速且稳定的节点，并且将会在您的中继回路中维持两到三个月，用来抵挡破解匿名攻击。" + +#: http//localhost/tbb/tbb-42/ +#: (content/tbb/tbb-42/contents+en.lrquestion.seo_slug) +msgid "tor-browser-firefox-not-working-error" +msgstr "Tor Browser 提示 Firefox 无响应" + +#: http//localhost/tbb/tbb-31/ +#: (content/tbb/tbb-31/contents+en.lrquestion.seo_slug) +msgid "which-platform-tor-browser-available" +msgstr "Tor Browser 可用于哪些平台" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* TorBrowser" +msgstr "* Tor Browser" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "#Address noname.example.com" +msgstr "#Address noname.example.com" + +#: http//localhost/tbb/tbb-1/ +#: (content/tbb/tbb-1/contents+en.lrquestion.description) +msgid "" +"Whenever we release a new stable version of Tor Browser, we write a blog " +"post that details its new features and known issues." +msgstr "当新的 Tor Browser 稳定版本发布时，我们将会写一篇包括新的特性与已知问题的博文。" + +#: http//localhost/misc/misc-1/ +#: (content/misc/misc-1/contents+en.lrquestion.description) +msgid "" +"The same protections that keep bad people from breaking Tor's anonymity also" +" prevent us from tracking users." +msgstr "Tor 具有避免恶意用户破坏匿名性的保护措施，这些措施也阻止了我们追踪用户。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If you’re having trouble connecting, please select the option to \"copy Tor " +"log to clipboard.\"" +msgstr "如果你遇到了连接问题，请选择 “复制 Tor 日志到剪贴板” 选项。" + +#: http//localhost/tbb/tbb-23/ +#: (content/tbb/tbb-23/contents+en.lrquestion.description) +msgid "" +"<a href=\"https://duckduckgo.com/\">DuckDuckGo</a> is the " +"default search engine in Tor Browser." +msgstr "" +"<a href=\"https://duckduckgo.com/\">DuckDuckGo</a> 是 Tor " +"Browser 的默认搜索引擎。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory " +"server" +msgstr "" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory " +"server" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.title) +msgid "" +"I've heard about websites that are only accessible over Tor. What are these " +"websites, and how can I access them?" +msgstr "我了解到有些网站只能使用Tor访问。这些网站是什么？我该如何访问它们？" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* For Windows" +msgstr "* 对 Windows" + +#: http//localhost/tbb/tbb-26/ +#: (content/tbb/tbb-26/contents+en.lrquestion.title) +msgid "I'm having a problem with HTTPS Everywhere." +msgstr "我遇到 HTTPS Everywhere 的使用问题。" + +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.seo_slug) +msgid "tor-browser-issues-facebook-twitter-websites" +msgstr "Tor Browser 在 Facebook / Twitter 等网站遇到了问题" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Korean (ko)" +msgstr "韩语" + +#: http//localhost/tbb/tbb-24/ +#: (content/tbb/tbb-24/contents+en.lrquestion.description) +msgid "" +"Please see the <a href=\"https://duck.co/help\">DuckDuckGo support " +"portal</a>." +msgstr "" +"请访问 <a href=\"https://duck.co/help\">DuckDuckGo 的支持网站</a> " +"了解详细信息。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " +"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" +msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect " +"toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" + +#: http//localhost/misc/misc-10/ +#: (content/misc/misc-10/contents+en.lrquestion.seo_slug) +msgid "does-tor-project-offer-hosting" +msgstr "Tor Project 是否提供虚拟主机服务" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"By blocking Tor users, you are likely blocking people in repressive " +"countries who want to use a free internet, journalists and researchers who " +"want to protect themselves from discovery, whistleblowers, activists, and " +"ordinary people who want to opt out of invasive third party tracking." +msgstr "" +"封锁 Tor " +"用户意味着也可能封锁了希望在专制国家自由的浏览互联网的用户，希望隐藏自己避免被发现的研究人员、记者、举报人和社会活动家，或只是希望不被第三方跟踪的普通人。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.title) +msgid "" +"Is there a way to change the IP address that Tor Browser assigns me for a " +"particular site?" +msgstr "我可以改变 Tor Browser为我在某个网站分配的 IP 地址吗？" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with " +"SSL state (No SSL object)" +msgstr "" +"13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with " +"SSL state (No SSL object)" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Italiano (it)" +msgstr "意大利语" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.description) +msgid "" +"Right now the path length is hard-coded at 3 plus the number of nodes in " +"your path that are sensitive." +msgstr "目前路径的长度为 3 加上你的路径中敏感路径的数量。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* العربية (ar)" +msgstr "阿拉伯语" + +#: http//localhost/misc/misc-6/ +#: (content/misc/misc-6/contents+en.lrquestion.description) +msgid "Tor doesn't keep any logs that could identify a particular user." +msgstr "Tor 不会保留能识别用户身份的日志记录。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "## Set your own contact info" +msgstr "## 设置你的联系方式" + +#: http//localhost/misc/misc-14/ +#: (content/misc/misc-14/contents+en.lrquestion.description) +msgid "" +"Please see our <a " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">volunteer " +"page</a> for how to get involved!" +msgstr "" +"请参见我们的<a href=\"https://www. Tor " +"project.org/getinvolved/volunteer.html.en\">志愿者页面</a>以了解参与项目的方法！" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.title) +msgid "" +"When I'm using Tor, can eavesdroppers still see the information I share with" +" websites, like login information and things I type into forms?" +msgstr "当我使用 Tor 时，窃听者能够获取我分享给网站的信息（登陆信息或者其他以这种格式传递的信息）吗？" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Selecting it will cause the currently-active tab or window to be reloaded " +"over a new Tor circuit." +msgstr "选择它会在新的 Tor 线路上加载当前标签页。" + +#: http//localhost/misc/misc-1/ +#: (content/misc/misc-1/contents+en.lrquestion.description) +msgid "There is nothing the Tor developers can do to trace Tor users." +msgstr "Tor 开发者没有追踪 Tor 用户的手段。" + +#: http//localhost/tbb/tbb-14/ +#: (content/tbb/tbb-14/contents+en.lrquestion.description) +msgid "" +"Tor Browser already comes installed with two add-ons — HTTPS Everywhere and " +"NoScript — and adding anything else could deanonymize you." +msgstr "" +"Tor Browser 已经默认安装了两个插件——HTTPS Everywhere 和 NoScript—— " +"再安装别的插件将会让你降低（或失去）匿名性。" + +#: http//localhost/tbb/tbb-4/ (content/tbb/tbb-4/contents+en.lrquestion.title) +msgid "Why is Tor Browser built from Firefox and not some other browser?" +msgstr "为什么 Tor Browser 是基于 Firefox 而不是其他的浏览器呢？" + +#: http//localhost/tbb/tbb-35/ +#: (content/tbb/tbb-35/contents+en.lrquestion.title) +msgid "Can you get rid of all the captchas?" +msgstr "如何避免那些验证码？" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.description) +msgid "" +"If this is your first introduction to Tor Browser, we understand that you " +"might think we're bad people who enable even worse people." +msgstr "如果这是你第一次听说 Tor Browser，我们知道你可能会认为我们是坏人。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "$ deb http://deb.torproject.org/torproject.org <version> main" +msgstr "$ deb http://deb.torproject.org/torproject.org <version> main" + +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead." +msgstr "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead." + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "" +"Have a separate IP address for your exit relay, and don't route your own " +"traffic through it." +msgstr "你的出口节点有一个独立的 IP 地址，而且不会传输你的流量。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "13-11-17 19:53:49.300 [WARN] 10 connections have failed:" +msgstr "13-11-17 19:53:49.300 [WARN] 10 connections have failed:" + +#: http//localhost/tormobile/tormobile-5/ +#: (content/tormobile/tormobile-5/contents+en.lrquestion.title) +msgid "When is Tor Browser for Android being released?" +msgstr "基于 Android 平台的 Tor 什么时候会发布呢？" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.seo_slug) +msgid "how-do-i-run-a-middle-or-guard-relay" +msgstr "运行一个中转节点（或中间节点）" + +#: http//localhost/misc/misc-15/ +#: (content/misc/misc-15/contents+en.lrquestion.description) +msgid "" +"You can find more information about donating on our <a " +"href=\"https://donate.torproject.org/donor-faq\">donor FAQ</a>." +msgstr "" +"您可以访问<a href=\"https://donate. Tor project.org/donor-" +"faq\">捐款常见问题界面</a>，以了解更多捐款方面的信息。" + +#: http//localhost/tbb/tbb-40/ +#: (content/tbb/tbb-40/contents+en.lrquestion.seo_slug) +msgid "different-circuit-each-website" +msgstr "为每一个网站使用不同的线路" + +#: http//localhost/misc/misc-9/ +#: (content/misc/misc-9/contents+en.lrquestion.description) +msgid "" +"A large portion of the features Vidalia offered have now been integrated " +"into Tor Browser itself." +msgstr "Vidalia 提供的许多功能已经整合进了 Tor Browser 中。" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.seo_slug) +msgid "antivirus-blocking-tor" +msgstr "防病毒软件封锁了 Tor？" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"See <a href=\"#operators-6\">How do I run a bridge</a> for " +"instructions." +msgstr "参阅 <a href=\"#operators-6\">如何运行一个网桥</a> 了解详细信息。" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* firefox.exe" +msgstr "* firefox.exe" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.seo_slug) +msgid "change-the-number-of-hops-tor-uses" +msgstr "修改 Tor 的中转次数" + +#: http//localhost/misc/misc-7/ +#: (content/misc/misc-7/contents+en.lrquestion.description) +msgid "No, we don't provide any online services." +msgstr "不，我们不提供任何在线服务。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. " +"Discarding this circuit." +msgstr "" +"11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. " +"Discarding this circuit." + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" +msgstr "" +"11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"When accessing a website that uses an onion service, Tor Browser will show " +"at the URL bar an icon of a little green onion displaying the state of your " +"connection: secure and using an onion service." +msgstr "当你浏览洋葱服务网站时，Tor Browser 会在地址栏左侧以一个绿色的洋葱图标表示（使用洋葱服务的安全连接）。 " + +#: http//localhost/misc/misc-9/ +#: (content/misc/misc-9/contents+en.lrquestion.description) +msgid "Vidalia is no longer maintained or supported." +msgstr "Vidalia 已经不再维护和支持。" + +#: http//localhost/gettor/gettor-1/ +#: (content/gettor/gettor-1/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.description) +msgid "" +"GetTor is a service that automatically responds to messages with links to " +"the latest version of Tor Browser, hosted at a variety of locations that are" +" less likely to be censored, such as Dropbox, Google Drive, and GitHub." +msgstr "" +"GetTor 是一项通过不同方式自动回复最新版 Tor Browser 下载链接的服务。这些链接由不同处所托管，例如 Dropbox 、Google " +"Drive 和 GitHub." + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "Next, exclude the following processes:" +msgstr "接下来，执行以下步骤：" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.description) +msgid "" +"The default setting in the Windows installer also creates a shortcut for you" +" on your Desktop, though be aware that you may have accidentally unticked " +"the option to create a shortcut." +msgstr "Tor Browser 的 Windows 安装程序默认会在桌面上创建一个快捷方式，也许你不小心取消选中了那个选项。" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.title) +msgid "To use GetTor via email." +msgstr "通过电子邮件使用 GetTor。" + +#: http//localhost/tbb/tbb-1/ (content/tbb/tbb-1/contents+en.lrquestion.title) +msgid "" +"What are the most common issues with the latest stable version of Tor " +"Browser?" +msgstr "常见于最新稳定版本的 Tor Browser 的问题是什么？" + +#: http//localhost/tormessenger/tormessenger-1/ +#: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description) +msgid "" +"No. After eleven beta releases, we discontinued support of <a " +"href=\"https://blog.torproject.org/sunsetting-tor-messenger\">Tor " +"Messenger</a>." +msgstr "" +"不，在几次 beta 版之后，我们终止了 <a href=\"https://blog.torproject.org/sunsetting-tor-" +"messenger\">Tor Messenger</a> 的支持。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If you see lines like this in your Tor log, it means your system clock is " +"incorrect." +msgstr "如果您看见这些提示出现在您的日志里面，这意味着您的系统时间设置错误。" + +#: http//localhost/tormessenger/tormessenger-1/ +#: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description) +msgid "" +"We still believe in Tor's ability to be used in a messaging app, but we " +"don't have the resources to make it happen right now." +msgstr "即使现在没有那么多资源进行这项工作，我们依旧相信 Tor 可以和即时消息结合。" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.seo_slug) +msgid "to-use-gettor-via-email" +msgstr "通过电子邮件使用 GetTor" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "* Run \"apt-get install tor obfs4proxy\" (as root)." +msgstr "* 以 root 用户运行 \"apt-get install tor obfs4proxy\"" + +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.seo_slug) +msgid "is-my-network-censored" +msgstr "我的网络被审查了？" + +#: http//localhost/tormobile/tormobile-3/ +#: (content/tormobile/tormobile-3/contents+en.lrquestion.description) +msgid "" +"We recommend an iOS app called Onion Browser, which is open source, uses Tor" +" routing, and is developed by someone who works closely with the Tor " +"Project." +msgstr "" +"在 iOS 上我们推荐 Onion Browser，它是开放源代码软件，使用 Tor 线路，而且由和 Tor Project 关系密切的人开发。" + +#: http//localhost/tbb/tbb-15/ +#: (content/tbb/tbb-15/contents+en.lrquestion.title) +msgid "Can I download Tor Browser for ChromeOS?" +msgstr "我能为 ChromeOS 下载 Tor Browser 吗?" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.description) +msgid "That is normal Tor behavior." +msgstr "这是 Tor 的正常行为。" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "Removing Tor Browser from your system is simple:" +msgstr "在您的系统上删除 Tor Browser 非常简单：" + +#: http//localhost/tormobile/tormobile-5/ +#: (content/tormobile/tormobile-5/contents+en.lrquestion.seo_slug) +msgid "tor-browser-for-android" +msgstr "Android 版 Tor Browser" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.seo_slug) +msgid "cannot-find-tor-on-windows" +msgstr "（Windows）找不到 Tor Browser" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "" +"Tor Browser will prompt you to update the software once a new version has " +"been released." +msgstr "每当 Tor Browser有更新版被发布时，都会有提示自动出现。" + +#: http//localhost/faq/faq-3/ +#: (content/faq/faq-3/contents+en.lrquestion.description) +msgid "" +"Tor Browser already comes installed with two add-ons — <a " +"href=\"https://www.eff.org/https-everywhere\">HTTPS Everywhere</a> " +"and <a href=\"https://noscript.net/\">NoScript</a> — and adding" +" anything else could deanonymize you." +msgstr "" +"Tor Browser 已经默认安装了两个插件——HTTPS Everywhere 和 NoScript—— " +"再安装别的插件将会让你降低（或失去）匿名性。" + +#: http//localhost/gettor/ (content/gettor/contents+en.lrtopic.title) +#: (content/gettor/contents+en.lrtopic.seo_slug) +msgid "GetTor" +msgstr "GetTor" + +#: http//localhost/tbb/tbb-32/ +#: (content/tbb/tbb-32/contents+en.lrquestion.description) +msgid "" +"The Tor Browser works hard to isolate itself from the rest of your system, " +"and the steps for making it the default browser are unreliable." +msgstr "Tor Browser 做了大量工作使它和你的操作系统的其他部分相互隔离，以及设置为默认浏览器的过程并不可靠。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "" +"Look for a log entry in /var/log/tor/notices.log such as \"Self-testing " +"indicates your ORPort is reachable from the outside. Excellent.\"" +msgstr "" +"在 /var/log/tor/notices.log 中查找例如 \"Self-testing indicates your ORPort is " +"reachable from the outside. Excellent.\" 这样的日志记录。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "" +"However, information sent unencrypted over the internet using plain HTTP can" +" still be intercepted by exit relay operators or anyone observing the " +"traffic between your exit relay and your destination website." +msgstr "不过，出口节点和出口节点与目标网站之间的监听者能看到通过 HTTP 协议传输的未加密的内容。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor " +"network" +msgstr "" +"11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor " +"network" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"Onion services are also relied on for metadata-free chat and file sharing, " +"safer interaction between journalists and their sources like with <a " +"href=\"https://securedrop.org/\">SecureDrop</a> or <a " +"href=\"https://onionshare.org/\">OnionShare</a>, safer software " +"updates, and more secure ways to reach popular websites like <a " +"href=\"https://www.facebook.com/notes/protect-the-graph/making-connections-" +"to-facebook-more-secure/1526085754298237/\">Facebook</a>." +msgstr "" +"有各种各样的洋葱服务网站，例如让记者和他的资料来源间无元数据的交谈和安全的传输文件的 <a " +"href=\"https://securedrop.org/\">SecureDrop</a> 和 <a " +"href=\"https://onionshare.org/\">OnionShare</a>，安全的更新软件，以及以更安全的方式访问<a " +"href=\"https://www.facebook.com/notes/protect-the-graph/making-connections-" +"to-facebook-more-secure/1526085754298237/\">Facebook</a>一类的网站。" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.description) +msgid "" +"For example, the DuckDuckGo onion is <a " +"href=\"http://3g2upl4pq6kufc4m.onion\">https://3g2upl4pq6kufc4m.onion</a>." +msgstr "" +"例如 DuckDuckGo 的洋葱服务： <a " +"href=\"http://3g2upl4pq6kufc4m.onion\">https://3g2upl4pq6kufc4m.onion</a>." + +#: http//localhost/tormobile/tormobile-1/ +#: (content/tormobile/tormobile-1/contents+en.lrquestion.seo_slug) +msgid "run-tor-on-android" +msgstr "在 Android 上运行 Tor" + +#: http//localhost/faq/faq-5/ +#: (content/faq/faq-5/contents+en.lrquestion.description) +#: http//localhost/misc/misc-13/ +#: (content/misc/misc-13/contents+en.lrquestion.description) +msgid "" +"Generally speaking, we don't recommend using a VPN with Tor unless you're an" +" advanced user who knows how to configure both in a way that doesn't " +"compromise your privacy." +msgstr "通常情况下，除非你知道如何把 VPN 和 Tor 在不侵犯你的隐私的情况下一起配置，我们不建议将这两者配合使用。" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.description) +msgid "" +"Websites that are only accessible over Tor are called \"onions\" and end in " +"the TLD .onion." +msgstr "只能通过 Tor 访问的网站称作“洋葱服务”，它们以 .onion 结尾。" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.description) +msgid "" +"Also, using paths longer than 3 could harm anonymity, first because it " +"makes<a href=\"https://www.freehaven.net/anonbib/#ccs07-doa\">denial " +"of security</a> attacks easier, and second because it could act as an" +" identifier if only a small number of users have the same path length as " +"you." +msgstr "" +"而且使用超过三个中继的线路会损害你的匿名性，首先这会让<a " +"href=\"https://www.freehaven.net/anonbib/#ccs07-doa\">拒绝服务攻击</a>更容易，其次如果只有很少的用户的中继长度和你一样的话，你会更容易被区分出来。" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.title) +msgid "How do I run a obfs4 bridge on Debian?" +msgstr "我如何在 Debian 中搭建一个 obfs4 网桥？" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.seo_slug) +msgid "website-locks-torbrowser-out" +msgstr "网站封锁了来自 Tor Browser 的访问？" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.description) +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.description) +msgid "* Linux" +msgstr "* GNU/Linux" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.description) +msgid "" +"If you don't remember what this destination was, it's most likely your " +"Downloads or Desktop folder." +msgstr "如果您忘记了它位于哪里，那么最大的可能性它会位于桌面或者下载文件夹。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) " +"with SSL state SSLv2/v3 read server hello A in HANDSHAKE" +msgstr "" +"13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) " +"with SSL state SSLv2/v3 read server hello A in HANDSHAKE" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"Sometimes websites will block Tor users because they can't tell the " +"difference between the average Tor user and automated traffic." +msgstr "有些网站屏蔽了 Tor 因为他们无法分辨出普通 Tor 用户和机器人的区别。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "$ lsb_release -c" +msgstr "$ lsb_release -c" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.seo_slug) +msgid "uninstall-tor-browser" +msgstr "卸载 Tor Browser" + +#: http//localhost/tbb/tbb-4/ +#: (content/tbb/tbb-4/contents+en.lrquestion.description) +msgid "" +"Tor Browser is a modified version of Firefox specifically designed for use " +"with Tor." +msgstr "Tor Browser 是为和 Tor 一起使用而定制的 Firefox 。" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.description) +msgid "" +"Write your operating system (such as windows, MacOS (OS X), or linux) in the" +" body of the message and send." +msgstr "在信息正文中写出您的操作系统（如Windows，MacOS（OS X）或Linux）并发送。" + +#: http//localhost/tbb/tbb-6/ (content/tbb/tbb-6/contents+en.lrquestion.title) +msgid "Can I make Tor Browser my default browser?" +msgstr "我能将 Tor Browser作为我的默认浏览器吗？" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "" +"For the most in-depth resource on running a relay, see the <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " +"Relay Guide</a>." +msgstr "" +"请参阅<a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">Tor " +"中继指南</a>以了解关于运行一个 Tor 中继的更多信息。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "##### Common log error #2: Can’t reach guard relays" +msgstr "##### 常见错误 #2: 无法连接到中继" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"Setting up an obfsproxy bridge requires an additional software package and " +"additional configurations." +msgstr "需要一些额外软件和设置来运行 obfsproxy 网桥。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "" +"* As root, add the following lines to /etc/apt/sources.list. Use the version" +" you found in the previous step for <version>." +msgstr "* 以 root 用户把下面的行添加到 /etc/apt/sources.list 中。用前一步你获得的版本号代替 <version>。" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"And if you're accessing a website with https and onion service, it will show" +" an icon of a green onion and a padlock." +msgstr "如果你正在通过 https 访问一个洋葱服务网站，你会在地址栏的左侧看到一个有绿色锁的洋葱图标。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "" +"<h4 class=\"card-title\">If you are using HTTPS, your website URL will begin" +" with \"https://\".</h4>" +msgstr "<h4 class=\"card-title\">如果你正在使用 HTTPS ，你的 URL 会以 “https://” 开头。</h4>" + +#: http//localhost/tormobile/tormobile-3/ +#: (content/tormobile/tormobile-3/contents+en.lrquestion.description) +msgid "" +"<a href=\"https://blog.torproject.org/tor-heart-onion-browser-and-" +"more-ios-tor\">Learn more about Onion Browser</a>." +msgstr "" +"<a href=\"https://blog. Tor project.org/ Tor -heart-onion-browser-and-" +"more-ios- Tor \">了解更多关于 Onion Browser 的信息</a>。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "Nickname ididnteditheconfig" +msgstr "Nickname ididnteditheconfig" + +#: http//localhost/misc/misc-6/ +#: (content/misc/misc-6/contents+en.lrquestion.seo_slug) +msgid "does-tor-keep-logs" +msgstr "Tor 是否保留日志" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +msgid "Thank you.\"" +msgstr "谢谢你。\"" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* 日本語 (ja)" +msgstr "* 日语" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "##### New Tor Circuit for this Site" +msgstr "##### 为此站点使用新 Tor 线路" + +#: http//localhost/tbb/tbb-23/ +#: (content/tbb/tbb-23/contents+en.lrquestion.title) +msgid "" +"What search engine comes with Tor Browser and how does it protect my " +"privacy?" +msgstr "Tor Browser 使用什么搜索引擎，它是如何保护我的隐私的?" + +#: http//localhost/tbb/tbb-20/ +#: (content/tbb/tbb-20/contents+en.lrquestion.description) +#: http//localhost/connecting/connecting-1/ +#: (content/connecting/connecting-1/contents+en.lrquestion.description) +msgid "Please make sure your system clock and timezone are set accurately." +msgstr "请确认你的时钟，日期和时区设置正确。" + +#: http//localhost/tbb/tbb-5/ +#: (content/tbb/tbb-5/contents+en.lrquestion.description) +msgid "" +"You can certainly use another browser while you are also using Tor Browser." +msgstr "你当然可以在使用 Tor Browser 时使用其它的浏览器。" + +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.description) +msgid "" +"If you cannot reach the onion service you desire, make sure that you have " +"entered the 16-character or, the newest format, 56-character onion address " +"correctly: even a small mistake will stop Tor Browser from being able to " +"reach the site." +msgstr "" +"如果无法访问您想访问的洋葱服务，请检查是否正确输入了洋葱地址的16个字符（或者新版地址的56个字符）。只要有一点点错误， Tor Browser " +"就无法连接到网站。" + +#: http//localhost/censorship/ +#: (content/censorship/contents+en.lrtopic.seo_slug) +msgid "censorship" +msgstr "审查" + +#: http//localhost/misc/misc-2/ +#: (content/misc/misc-2/contents+en.lrquestion.title) +msgid "Why don't you prevent bad people from doing bad things when using Tor?" +msgstr "你们为什么不阻止那些心怀不轨的人用 Tor 做坏事呢？" + +#: http//localhost/misc/misc-5/ +#: (content/misc/misc-5/contents+en.lrquestion.description) +msgid "" +"The Tor Project does not support or condone the use of our software for " +"malicious purposes." +msgstr "Tor Project 没有支持也没有纵容以恶意的方式使用我们的软件。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "* Determine your Ubuntu version by running the following command:" +msgstr "* 运行下面的命令确定你 Ubuntu 的版本" + +#: http//localhost/faq/faq-4/ +#: (content/faq/faq-4/contents+en.lrquestion.description) +msgid "" +"Tor Browser is currently available on <a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en#windows\">Windows</a>, <a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en#linux\">Linux</a> and <a " +"href=\"https://www.torproject.org/download/download-easy.html.en#mac\">macOS" +" (OS X)</a>." +msgstr "" +"Tor Browser 目前支持 <a href=\"https://www.torproject.org/download" +"/download-easy.html.en#windows\">Windows</a>、<a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en#linux\">GNU/Linux</a> 和 <a " +"href=\"https://www.torproject.org/download/download-easy.html.en#mac\">macOS" +" (OS X)</a>操作系统。" + +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.seo_slug) +msgid "our-website-is-blocked-by-a-censor" +msgstr "网站被审查者封锁？" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "Finally, restart Tor Browser." +msgstr "最后，重新启动 Tor Browser。" + +#: http//localhost/connecting/ (content/connecting/contents+en.lrtopic.title) +msgid "Connecting To Tor" +msgstr "连接 Tor" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "" +"* Note that your operating system’s standard \"Uninstall\" utility is not " +"used." +msgstr "* 不需要使用操作系统中的卸载工具。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +msgid "" +"When it confirms that it's reachable, it will upload a \"server descriptor\"" +" to the directory authorities to let clients know what address, ports, keys," +" etc your relay is using." +msgstr "当它确认可以连接的时候，它会发送“服务器描述符”到中继目录来让客户端知道它的地址、端口、密钥和你的节点使用的中继等信息。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>" +msgstr "ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>" + +#: http//localhost/misc/misc-9/ +#: (content/misc/misc-9/contents+en.lrquestion.title) +msgid "I'm having a problem updating or using Vidalia." +msgstr "我在使用或是升级 Vidalia 的时候出现问题。" + +#: http//localhost/tbb/tbb-20/ +#: (content/tbb/tbb-20/contents+en.lrquestion.description) +#: http//localhost/connecting/connecting-1/ +#: (content/connecting/connecting-1/contents+en.lrquestion.description) +msgid "" +"One of the most common issues that causes connection errors in Tor Browser " +"is an incorrect system clock." +msgstr "造成 Tor 连接失败的最常见的问题之一是系统时间设置错误。" + +#: http//localhost/tbb/tbb-2/ (content/tbb/tbb-2/contents+en.lrquestion.title) +msgid "Why is the first IP address in my relay circuit always the same?" +msgstr "为什么我连接的中继回路，第一个IP地址总是相同的呢？" + +#: http//localhost/tbb/tbb-31/ +#: (content/tbb/tbb-31/contents+en.lrquestion.description) +msgid "" +"For Android, The Guardian Project maintains the Tor-powered apps Orbot and " +"Orfox." +msgstr " Guardian Project 维护在 Android 上使用 Tor 网络的应用程序 Orbot 和 Orfox。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory " +"server" +msgstr "" +"19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to direc Tor y " +"server" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.description) +msgid "" +"The only way to resolve this is by following the site’s recommended " +"procedure for account recovery, or contacting the operators and explaining " +"the situation." +msgstr "要解决此情况的唯一方式是利用网站服务提供的帐号恢复功能，或直接向该网站服务的提供业者说明您的情况。" + +#: http//localhost/connecting/connecting-1/ +#: (content/connecting/connecting-1/contents+en.lrquestion.description) +msgid "" +"If this doesn't fix the problem, see the Troubleshooting page on the " +"<a href=\"https://tb-manual.torproject.org/en-" +"US/troubleshooting.html\">Tor Browser manual</a>." +msgstr "" +"如果这个问题还没有被解决，请查看位于<a href=\"https://tb-manual. Tor project.org/en-" +"US/troubleshooting.html\"> Tor Browser 手册</a>的故障排查界面。" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.description) +msgid "" +"You may be able to avoid this scenario if your provider offers 2-factor " +"authentication, which is a much better security option than IP-based " +"reputations." +msgstr "如果你所使用服务的提供商支持比基于 IP 的验证更安全的双因素认证选项的话，你也许能规避这种场景。" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.title) +msgid "" +"My antivirus or malware protection is blocking me from accessing Tor " +"Browser." +msgstr "一些反病毒程序和恶意程序防护软件禁止我使用 Tor Browser。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"If you don't see this message, it means that your relay is not reachable " +"from the outside." +msgstr "如果你没看到这条消息，你的中继可能无法被访问。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "DirPort 9030" +msgstr "DirPort 9030" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* obfs4proxy (if you use bridges)" +msgstr "* obfs4proxy （如果你使用网桥）" + +#: http//localhost/tbb/tbb-5/ +#: (content/tbb/tbb-5/contents+en.lrquestion.description) +msgid "" +"Be careful when switching back and forth between Tor and a less safe " +"browser, because you may accidentally use the other browser for something " +"you intended to do using Tor." +msgstr "不过在切换浏览器时要多加小心，你也许会不小心在普通浏览器里执行要在 Tor Browser 中执行的操作。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<div class=\"card-body\">" +msgstr "<div class=\"card-body\">" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.seo_slug) +msgid "cannot-reach-x-onion" +msgstr "我无法访问X.onion" + +#: http//localhost/misc/misc-3/ +#: (content/misc/misc-3/contents+en.lrquestion.title) +msgid "Who funds Tor?" +msgstr "哪些个人或者集团在资助 Tor ？" + +#: http//localhost/tbb/tbb-24/ +#: (content/tbb/tbb-24/contents+en.lrquestion.seo_slug) +msgid "problem-with-duckduckgo" +msgstr "在使用 DuckDuckGo 时遇到问题" + +#: http//localhost/tbb/tbb-23/ +#: (content/tbb/tbb-23/contents+en.lrquestion.seo_slug) +msgid "search-engine-tor-browser" +msgstr "Tor Browser 所使用的搜索引擎" + +#: http//localhost/tbb/tbb-36/ +#: (content/tbb/tbb-36/contents+en.lrquestion.title) +msgid "Can I run multiple instances of Tor Browser?" +msgstr "我能同时运行多个 Tor Browser 吗？" + +#: http//localhost/tbb/tbb-25/ +#: (content/tbb/tbb-25/contents+en.lrquestion.description) +msgid "" +"Please see the <a href=\"https://noscript.net/faq\">NoScript " +"FAQ</a>." +msgstr "" +"请参阅 <a href=\"https://noscript.net/faq\">NoScript 的常见问题 </a>。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"You should re-check your firewalls, check that the IP and ports you " +"specified in your torrc are correct, etc." +msgstr "你应该复查你的防火墙设置，检查你在你的 torrc 中设置的用户名和端口是否正确。" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "" +"Onion services allow people to browse but also to publish anonymously, " +"including publishing anonymous websites." +msgstr "洋葱服务允许人们匿名的访问和发表信息，包括架设匿名网站。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.seo_slug) +msgid "need-tor-browser-language-not-english" +msgstr "我需要 Tor Browser 提供英语之外的语言" + +#: http//localhost/tormobile/tormobile-5/ +#: (content/tormobile/tormobile-5/contents+en.lrquestion.description) +msgid "" +"We are currently working on Tor Browser for Android, and you may see alpha " +"releases appear over the coming months." +msgstr "我们正在进行和 Android 上的 Tor Browser 相关的工作，你也许会在接下来的几个月内发现预发行版本。" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.seo_slug) +msgid "to-use-gettor-via-twitter" +msgstr "通过 Twitter 使用 GetTor" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "" +"* Add the gpg key used to sign the packages by running the following " +"commands:" +msgstr "* 运行下面的命令来添加签名软件包的 gpg 公钥：" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.description) +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.description) +msgid "* MacOS (OS X)" +msgstr "* macOS (OS X)" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"If you see lines like these in your Tor log, it means your Tor failed to " +"connect to the first node in the Tor circuit." +msgstr "如果您看见这些提示出现在您的日志里面，这意味着您的Tor连接 Tor网络中的第一个节点失败了。" + +#: http//localhost/tormessenger/tormessenger-1/ +#: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description) +msgid "" +"Do you? <a " +"href=\"https://www.torproject.org/about/contact.html.en\">Contact " +"us</a>." +msgstr "" +"你想这样做吗？<a " +"href=\"https://www.torproject.org/about/contact.html.en\">联系我们</a>。" + +#: http//localhost/gettor/gettor-1/ +#: (content/gettor/gettor-1/contents+en.lrquestion.seo_slug) +msgid "how-to-download-tor-if-torproject-org-is-blocked" +msgstr "torproject.org 被屏蔽了，怎么下载 Tor？" + +#: http//localhost/tbb/tbb-1/ +#: (content/tbb/tbb-1/contents+en.lrquestion.description) +msgid "" +"If you started having issues with your Tor Browser after an update, check " +"out <a " +"href=\"https://blog.torproject.org\">blog.torproject.org</a> for the " +"most recent stable Tor Browser post to see if your issue is listed." +msgstr "" +"如果您在升级后使用 Tor Browser 时出现问题，请查阅<a href=\"https://blog. Tor " +"project.org\">https://blog. Tor project.org " +"</a>。您的问题可能会被包含在我们发布的有关最新稳定版本 Tor Browser 的博客中。" + +#: http//localhost/misc/ (content/misc/contents+en.lrtopic.title) +msgid "Misc" +msgstr "其它" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "* obfs4proxy.exe (if you use bridges)" +msgstr "* obfs4proxy.exe （如果你使用网桥）" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "" +"After a few hours (to give it enough time to propagate), you can query " +"<a " +"href=\"https://metrics.torproject.org/rs.html#search\">Metrics</a> to" +" see whether your relay has successfully registered in the network." +msgstr "" +"在几个小时后（传播需要足够的时间），你可以访问<a " +"href=\"https://metrics.torproject.org/rs.html#search\">Metrics</a> " +"来确认你的中继有没有注册到网路中。" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.description) +msgid "" +"GetTor will respond with an email containing links from which you can " +"download Tor Browser, the cryptographic signature (needed for <a " +"href=\"https://www.torproject.org/docs/verifying-" +"signatures.html.en\">verifying the download</a>), the fingerprint of " +"the key used to make the signature, and the package’s checksum." +msgstr "" +"GetTor 将会给你自动回复一封电子邮件给，信中会带有 Tor Browser 的下载链接、数字签名（用于<a " +"href=\"https://www.torproject.org/docs/verifying-" +"signatures.html.en\">验证下载</a>）、签名的指纹和文件的散列值。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "<div class=\"card\">" +msgstr "<div class=\"card\">" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.title) +msgid "How do I make sure that I'm using the correct packages on Ubuntu?" +msgstr "我如何确定我正在 Ubuntu 上使用正确的软件包？" + +#: http//localhost/tormobile/tormobile-2/ +#: (content/tormobile/tormobile-2/contents+en.lrquestion.description) +msgid "" +"The Guardian Project maintains Tor (and other privacy applications) on " +"Android. More info can be found on the <a " +"href=\"https://guardianproject.info/\">Guardian Project's " +"website</a>." +msgstr "" +" Guardian Project 在 Android 上维护 Tor （以及其他保护隐私的软件），你可以在<a " +"href=\"https://guardianproject.info/\">The Guardian Project " +"的网站</a>上获得更多信息。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Other open tabs and windows from the same website will use the new circuit " +"as well once they are reloaded." +msgstr "在其它标签或窗口打开的相同的网站会在重新加载后使用新的线路。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "</div>" +msgstr "</div>" + +#: http//localhost/tormessenger/tormessenger-1/ +#: (content/tormessenger/tormessenger-1/contents+en.lrquestion.seo_slug) +msgid "tor-project-app-for-private-chat" +msgstr "Tor Project 和私密聊天" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "" +"Instead, consider running your exit relay in a commercial facility that is " +"supportive of Tor." +msgstr "推荐在支持 Tor 的商业实体（例如某些 VPS 服务商 —— 译者注）上搭建 Tor 的出口节点。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "Please try connecting with bridges, and that should fix the problem." +msgstr "请尝试通过网桥连接，这应该能解决您的问题。" + +#: http//localhost/tormobile/tormobile-1/ +#: (content/tormobile/tormobile-1/contents+en.lrquestion.description) +msgid "" +"Orfox is for web browsing, and Orbot can route other apps on your Android " +"phone over the Tor network." +msgstr "Orfox 用于浏览互联网，Orbot 可以让你的 Android 上的其它应用使用 Tor 网络。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "If it hasn't, re-check firewalls, IP and ports again." +msgstr "如果没有的话，请复查你的防火墙设置、IP 地址和端口。" + +#: http//localhost/tbb/tbb-12/ +#: (content/tbb/tbb-12/contents+en.lrquestion.description) +msgid "" +"Flash is disabled in Tor Browser, and we recommend you do not enable it." +msgstr "Tor Browser 中停用了 Flash，我们也不建议你启用它。" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.description) +msgid "" +"If you cannot reach the onion service you desire, make sure that you have " +"entered the 16-character onion address correctly: even a small mistake will " +"stop Tor Browser from being able to reach the site." +msgstr "" +"如果无法访问您想访问的洋葱服务，请检查是否正确输入了洋葱地址的16个字符（或者新版地址的56个字符）。只要有一点点错误， Tor Browser " +"就无法连接到网站。" + +#: http//localhost/tbb/tbb-18/ +#: (content/tbb/tbb-18/contents+en.lrquestion.description) +msgid "" +"There is something called the <a " +"href=\"https://www.torbsd.org/\">TorBSD project</a>, but their Tor " +"Browser is not officially supported." +msgstr "" +"不过有一个非官方支持的 <a href=\"https://www.torbsd.org/\">TorBSD 项目</a>。" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.seo_slug) +msgid "how-do-i-run-an-exit" +msgstr "我如何运行一个出口节点" + +#: http//localhost/ (content/contents+en.lrshowcase.title) +msgid "How can we help?" +msgstr "您需要什么帮助？" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Nederlands (nl)" +msgstr "荷兰语" + +#: http//localhost/tbb/tbb-4/ +#: (content/tbb/tbb-4/contents+en.lrquestion.description) +msgid "" +"<a " +"href=\"https://www.torproject.org/projects/torbrowser/design/\">Learn more " +"about the design of Tor Browser</a>." +msgstr "" +"<a " +"href=\"https://www.torproject.org/projects/torbrowser/design/\">了解关于 Tor " +"Browser 的设计的更多信息</a>。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "" +"We currently offer <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a> in the following languages:" +msgstr "" +"<a href=\"https://www.torproject.org/projects/torbrowser.html.en\"> " +"Tor Browser</a> 目前提供这些语言：" + +#: http//localhost/tormessenger/ +#: (content/tormessenger/contents+en.lrtopic.title) +msgid "Tor Messenger" +msgstr "Tor Messenger" + +#: http//localhost/tbb/tbb-33/ +#: (content/tbb/tbb-33/contents+en.lrquestion.seo_slug) +msgid "running-tor-browser-make-me-relay" +msgstr "运行 Tor Browser让我成为一个中继吗" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Español (es-ES)" +msgstr "法语" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.seo_slug) +msgid "cannot-connect-to-tor-browser-network-censored" +msgstr "无法连接 Tor Browser" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.description) +msgid "Contact your provider and ask them if they provide 2FA." +msgstr "联系你的服务提供商询问它们有没有支持双因素验证。" + +#: http//localhost/misc/misc-2/ +#: (content/misc/misc-2/contents+en.lrquestion.seo_slug) +msgid "prevent-bad-people-doing-bad-things-with-tor" +msgstr "为何不阻止用 Tor Browser 作恶的人？" + +#: http//localhost/faq/ (content/faq/contents+en.lrtopic.title) +msgid "Most Frequently Asked Questions" +msgstr "常见问题" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.title) +msgid "How do I uninstall Tor Browser?" +msgstr "我如何卸载 Tor Browser?" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.title) +msgid "" +"I downloaded and installed Tor Browser for Windows, but now I can't find it." +msgstr "我在 Windows 上下载并安装了 Tor Browser 但是没办法找到它。" + +#: http//localhost/tbb/tbb-28/ +#: (content/tbb/tbb-28/contents+en.lrquestion.description) +msgid "* Empty your Trash." +msgstr "* 清空回收站。" + +#: http//localhost/tormobile/tormobile-3/ +#: (content/tormobile/tormobile-3/contents+en.lrquestion.title) +msgid "Can I run Tor on an iOS device?" +msgstr "我能在 iOS 设备上使用 Tor 吗？" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.description) +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.description) +msgid "* Windows" +msgstr "* Windows" + +#: http//localhost/tormobile/tormobile-4/ +#: (content/tormobile/tormobile-4/contents+en.lrquestion.title) +msgid "How do I run Tor on Windows Phone?" +msgstr "我能在 Windows Phone 上使用 Tor 吗？" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.title) +msgid "" +"A website (bank, email provider, etc..) locks me out whenever I use Tor, " +"what can I do?" +msgstr "一个网站（银行，电子邮件等）封锁了我（即使我没再使用 Tor Browser），我该怎么办。" + +#: http//localhost/misc/misc-14/ +#: (content/misc/misc-14/contents+en.lrquestion.title) +msgid "How do I volunteer with Tor Project?" +msgstr "我如何作为一个志愿者参与 Tor Project？" + +#: http//localhost/tbb/tbb-5/ +#: (content/tbb/tbb-5/contents+en.lrquestion.description) +msgid "" +"However, you should know that the privacy properties of Tor Browser will not" +" be present in the other browser." +msgstr "不过你应该清楚其他浏览器不能提供和 Tor Browser 一样的隐私保护。" + +#: http//localhost/faq/faq-4/ +#: (content/faq/faq-4/contents+en.lrquestion.description) +msgid "" +"There is no official version of Tor for iOS yet, though we recommend " +"<a href=\"https://onionbrowser.com/\">Onion Browser</a>." +msgstr "" +"目前尚未有官方版本的基于 iOS 平台的 Tor 软件。尽管如此，我们仍然推荐使用<a " +"href=\"https://onionbrowser.com/\">Onion Browser</a>。" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "Enabling ntpd is suggested." +msgstr "推荐使用 ntpd 。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.seo_slug) +msgid "change-ip-address" +msgstr "改变 IP 地址" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "* Run the following commands to install tor and check its signatures:" +msgstr "* 运行下面的命令来检查前面并安装 tor：" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " +"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" +msgstr "" +"2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to " +"xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\")" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.description) +msgid "" +"You may be offered a choice of \"32-bit\" or \"64-bit\" software: this " +"depends on the model of the computer you are using; consult documentation " +"about your computer to find out more." +msgstr "你也许需要选择“32 位”或“64 位”版本：这和你的电脑有关，你可能需要查阅你电脑的文档来了解更多信息。" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.description) +msgid "" +"For more information on how guard relays work, see this <a " +"href=\"https://blog.torproject.org/improving-tors-anonymity-changing-guard-" +"parameters\">blog post</a> and <a href=\"https://www-" +"users.cs.umn.edu/~hoppernj/single_guard.pdf\">paper</a> on entry " +"guards." +msgstr "" +"要了解中转节点如何工作，请参阅<a href=\"https://blog.torproject.org/improving-tors-" +"anonymity-changing-guard-parameters\">这篇博客文章</a>和<a " +"href=\"https://www-" +"users.cs.umn.edu/~hoppernj/single_guard.pdf\">这篇论文</a>。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.title) +msgid "How do I run a middle or guard relay on Debian?" +msgstr "我如何在 Debian 上运行中转或中间节点？" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "" +"Most antivirus or malware protection allows the user to \"whitelist\" " +"certain processes that would otherwise be blocked." +msgstr "大多数防病毒软件允许你将某些进程添加到白名单中。" + +#: http//localhost/tbb/tbb-6/ +#: (content/tbb/tbb-6/contents+en.lrquestion.seo_slug) +msgid "make-tor-browser-default-browser" +msgstr "使 Tor Browser成为默认浏览器" + +#: http//localhost/tbb/tbb-42/ +#: (content/tbb/tbb-42/contents+en.lrquestion.description) +msgid "" +"If you are running an anti-virus, please see <a " +"href=\"http://support.torproject.org/#tbb-10\">My antivirus/malware " +"protection is blocking me from accessing Tor Browser</a>, it is " +"common for anti-virus / anti-malware software to cause this type of issue." +msgstr "" +"请参阅<a href=\"http://support.torproject.org/#tbb-10\">我的防病毒软件 / " +"反恶意软件工具阻止我使用 Tor Browser</a>，这是这种问题产生的主要原因。" + +#: http//localhost/tbb/tbb-26/ +#: (content/tbb/tbb-26/contents+en.lrquestion.seo_slug) +msgid "problem-with-https-everywhere" +msgstr "我遇到了 HTTPS Everywhere 的问题" + +#: http//localhost/censorship/ (content/censorship/contents+en.lrtopic.title) +msgid "Censorship" +msgstr "审查" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +msgid "" +"Please take a strong stance in favor of digital privacy and internet " +"freedom, and allow Tor users access to xyz.com." +msgstr "请采取强硬立场支持数字隐私和互联网自由，以及允许 Tor 用户访问 xyz.com。”" + +#: http//localhost/tbb/tbb-20/ +#: (content/tbb/tbb-20/contents+en.lrquestion.title) +#: http//localhost/connecting/connecting-1/ +#: (content/connecting/connecting-1/contents+en.lrquestion.title) +msgid "" +"Tor Browser won't connect, but it doesn’t seem to be an issue with " +"censorship." +msgstr "Tor Browser 没有连接上互联网，但这似乎并不是网络审查造成的问题。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " +"Browser Update\">" +msgstr "" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " +"Browser Update\">" + +#: http//localhost/onionservices/onionservices-1/ +#: (content/onionservices/onionservices-1/contents+en.lrquestion.description) +msgid "" +"The addresses must be shared with you by the website host, as onions are not" +" indexed in search engines in the typical way that vanilla websites are." +msgstr "因为洋葱服务并不能像普通的网站一样被索引，所以必须由网站所有者把洋葱服务的地址分享给你。" + +#: http//localhost/https/https-1/ +#: (content/https/https-1/contents+en.lrquestion.description) +msgid "" +"If the site you are visiting uses HTTPS, then the traffic leaving your exit " +"relay will be encrypted, and won't be visible to eavesdroppers." +msgstr "如果你访问的网站使用了 HTTPS，你的流量在离开出口节点时是加密的，不会被窃听者看到。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " +"Browser Menu\">" +msgstr "" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " +"Browser Menu\">" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "" +"For that reason, it's best not to run your exit relay in your home or using " +"your home internet connection." +msgstr "出于这些原因，最好不要在你的家中或使用你家里的网络运行出口节点。" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.title) +msgid "What is a bridge?" +msgstr "什么是网桥？" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "ORPort 9001" +msgstr "ORPort 9001" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.description) +msgid "" +"Any other application on your system (including other browsers) will not " +"have their connections routed over the Tor network, and will not be " +"protected." +msgstr "你操作系统上的其他程序（包括其他的浏览器）的连接不会使用 Tor 网络，也不会被保护。" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"* You should also see the message \"Registered server transport 'obfs4'\" " +"indicating that obfs4proxy is functional." +msgstr "*你应该会看到 \"Registered server transport 'obfs4'\" 消息表示 obfs4proxy 正常工作。" + +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.description) +msgid "" +"The simplest fix is to click on the \"onion menu,\" then click on the " +"security slider." +msgstr "最简单的方法打开点开洋葱菜单的安全滑块。" + +#: http//localhost/misc/misc-2/ +#: (content/misc/misc-2/contents+en.lrquestion.description) +msgid "" +"Tor is designed to defend human rights and privacy by preventing anyone from" +" censoring things, even us." +msgstr "Tor 被设计成通过防止被各种人（甚至是我们）监控和审查来抵御人权和隐私。" + +#: http//localhost/operators/operators-7/ +#: (content/operators/operators-7/contents+en.lrquestion.description) +msgid "" +"Of course, you should avoid keeping any sensitive or personal information on" +" the computer hosting your exit relay." +msgstr "当然，你应该避免在你运行出口节点的电脑上存储任何敏感或与你有关的信息。" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"<a " +"href=\"https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt\">Obfsproxy</a>" +" bridges address this by adding another layer of obfuscation." +msgstr "" +"<a " +"href=\"https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt\">Obfsproxy</a>" +" 网桥通过增加一层混淆来解决这些问题。" + +#: http//localhost/tbb/tbb-11/ +#: (content/tbb/tbb-11/contents+en.lrquestion.description) +msgid "The file you download and run prompts you for a destination." +msgstr "你下载或运行的文件会提示你选择一个目标位置。" + +#: http//localhost/faq/faq-1/ +#: (content/faq/faq-1/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-3/ +#: (content/tbb/tbb-3/contents+en.lrquestion.description) +msgid "" +"Some entities, such as your Internet Service Provider (ISP), may be able to " +"see that you're using Tor, but they won't know where you're going when you " +"do." +msgstr "有些机构，例如您的互联网服务提供商，也许会知道您正在使用 Tor 。不过他们将不会知晓您正在使用 Tor 做些什么。" + +#: http//localhost/tbb/tbb-39/ +#: (content/tbb/tbb-39/contents+en.lrquestion.description) +msgid "" +"Sometimes Javascript-heavy websites can have functional issues over Tor " +"Browser." +msgstr "有时重度依赖 JavaScript 的网站无法在 Tor Browser 中正确运作。" + +#: http//localhost/gettor/gettor-2/ +#: (content/gettor/gettor-2/contents+en.lrquestion.description) +msgid "Send an email to gettor(a)torproject.org." +msgstr "给get Tor @ Tor project.org发送一封电子邮件。" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.description) +msgid "Only Tor Browser's traffic will be routed over the Tor network." +msgstr "只有 Tor Browser 的流量会通过 Tor 网络传输。" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.description) +msgid "" +"That is, in normal cases it's 3, but for example if you're accessing an " +"onion service or a \".exit\" address it could be more." +msgstr "是的，通常是三个，但如果你访问洋葱服务或是 \".exit\" 地址时会增加。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "* Run \"service tor reload\" (as root)" +msgstr "* 以 root 用户运行 \"service tor reload\"" + +#: http//localhost/misc/misc-7/ +#: (content/misc/misc-7/contents+en.lrquestion.description) +msgid "" +"A list of all of our software projects can be found on our <a " +"href=\"https://www.torproject.org/projects/projects.html.en\">projects " +"page</a>." +msgstr "" +"<a " +"href=\"https://www.torproject.org/projects/projects.html.en\">我们的页面上</a>有我们开发的软件的列表。" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"This option is useful if you want to prevent your subsequent browser " +"activity from being linkable to what you were doing before." +msgstr "这个选项在你不想让你接下来的浏览活动和以前的关联时会很有用。" + +#: http//localhost/misc/misc-10/ +#: (content/misc/misc-10/contents+en.lrquestion.title) +msgid "Does the Tor Project offer hosting?" +msgstr "Tor Project 提供虚拟主机服务吗？" + +#: http//localhost/faq/faq-5/ (content/faq/faq-5/contents+en.lrquestion.title) +#: http//localhost/misc/misc-13/ +#: (content/misc/misc-13/contents+en.lrquestion.title) +msgid "Can I use a VPN with Tor?" +msgstr "我能搭配 VPN 使用 Tor 吗？" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"Bridge relays are Tor relays that are not listed in the public Tor " +"directory." +msgstr "网桥是不在 Tor 公共目录里列出的中继节点。" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.description) +msgid "" +"You can also ensure that you're able to access other onion services by " +"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo</a>'s " +"Onion Service." +msgstr "" +"你也可以通过连接 <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo " +"的洋葱服务</a>确认你可以访问洋葱服务。" + +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.description) +msgid "" +"To get links for downloading Tor Browser, send a message to " +"gettor(a)torproject.org with one of the following codes in it:" +msgstr "要获得 Tor Browser 的下载链接，你可以向 gettor(a)torproject.org 发送带有下面信息的电子邮件：" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"\"Hi! I tried to access your site xyz.com while using Tor Browser and " +"discovered that you don't allow Tor users to access your site." +msgstr "“嗨！我正在使用 Tor Browser 访问 xyz.com ，不过似乎你们并没有允许 Tor 用户访问。" + +#: http//localhost/gettor/gettor-3/ +#: (content/gettor/gettor-3/contents+en.lrquestion.description) +msgid "" +"To get links for downloading Tor Browser, send a direct message to <a " +"href=\"https://twitter.com/get_tor\">@get_tor</a> with one of the " +"following codes in it (you don't need to follow the account):" +msgstr "" +"要获得 Tor Browser 的下载链接，你可以向 <a href=\"https://twitter.com/get_tor\"> " +"@get_tor </a>发送带有下列信息的私信（你不需要关注这个账号）：" + +#: http//localhost/tbb/tbb-32/ +#: (content/tbb/tbb-32/contents+en.lrquestion.description) +msgid "" +"This means sometimes a website would load in the Tor Browser, and sometimes " +"it would load in another browser, this type of behavior can be dangerous and" +" anonymity-breaking." +msgstr "这意味着有些网站会在 Tor Browser 中打开，有些会在其他浏览器中打开，这种行为很危险而且会破坏匿名性。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.description) +msgid "" +"Ultimately, we want to make Tor Browser as secure as possible while also " +"making it usable for the majority of people, so for now, that means leaving " +"Javascript enabled by default." +msgstr "" +"原则上来说，我们不仅想让 Tor Browser 尽可能安全，还想让大多数人都可以使用。所以按照目前状态， Tor Browser " +"会继续默认启用JavaScript。" + +#: http//localhost/tbb/tbb-12/ +#: (content/tbb/tbb-12/contents+en.lrquestion.description) +msgid "" +"Fortunately, most websites, devices, and other browsers are moving away from" +" the use of Flash." +msgstr "幸运的是，大多数网站、设备，还有其它浏览器正在淘汰 Flash。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "#MyFamily $keyid,$keyid,..." +msgstr "#MyFamily $keyid,$keyid,..." + +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug) +msgid "website-is-blocking-access-over-tor" +msgstr "网站封锁了来自 Tor 网络的访问" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"## The IP address or hostname for incoming connections (leave commented and " +"Tor will guess)" +msgstr "" +"## The IP address or hostname for incoming connections (leave commented and " +"Tor will guess)" + +#: http//localhost/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.seo_slug) +msgid "how-do-i-download-tor-if-torproject-org-is-blocked" +msgstr "torproject.org 被屏蔽了，怎么下载 Tor？" + +#: http//localhost/tbb/tbb-23/ +#: (content/tbb/tbb-23/contents+en.lrquestion.description) +msgid "" +"DuckDuckGo does not track its users nor does it store any data about user " +"searches. Learn more about <a " +"href=\"https://duckduckgo.com/privacy\">DuckDuckGo privacy " +"policy</a>." +msgstr "" +"DuckDuckGo （声称）不会跟踪它的用户也不会储存用户搜索的信息，你可以阅读 <a " +"href=\"https://duckduckgo.com/privacy\">DuckDuckGo 的隐私政策 </a>了解更多信息。" + +#: http//localhost/tbb/tbb-21/ +#: (content/tbb/tbb-21/contents+en.lrquestion.seo_slug) +msgid "view-tor-browser-message-log" +msgstr "我该怎么查询 Tor Browser 的消息日志？" + +#: http//localhost/tbb/tbb-38/ +#: (content/tbb/tbb-38/contents+en.lrquestion.seo_slug) +msgid "network-admin-know-i-am-using-tor" +msgstr "网络管理员是否会知道我使用 Tor " + +#: http//localhost/misc/misc-7/ +#: (content/misc/misc-7/contents+en.lrquestion.seo_slug) +msgid "does-tor-project-offer-email-or-privacy-protecting-web-services" +msgstr "Tor Project 提供邮件服务或者其他保护隐私的互联网服务吗" + +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.description) +msgid "" +"You can also ensure that you're able to access other onion services by " +"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo's onion " +"service</a>." +msgstr "" +"你也可以通过连接 <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo " +"的洋葱服务</a>确认你可以访问其他的洋葱服务。" + +#: http//localhost/misc/misc-14/ +#: (content/misc/misc-14/contents+en.lrquestion.seo_slug) +msgid "volunteer-with-tor-project" +msgstr "我如何作为一个志愿者参与 Tor Project？" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"Tor Browser will warn you that all activity and downloads will be stopped, " +"so take this into account before clicking \"New Identity\"." +msgstr "Tor Browser 会警告你所有的活动和下载会被终止，在你点击“新身份”时考虑这一点。" + +#: http//localhost/tbb/tbb-33/ +#: (content/tbb/tbb-33/contents+en.lrquestion.title) +msgid "Does running Tor Browser make me a relay?" +msgstr "运行 Tor Browser让我成为一个中继吗？" + +#: http//localhost/tbb/tbb-38/ +#: (content/tbb/tbb-38/contents+en.lrquestion.title) +msgid "Will my network admin be able to tell I'm using Tor Browser?" +msgstr "网络管理员能发现我正在使用 Tor Browser 吗？" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. " +"Discarding this circuit." +msgstr "" +"11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. " +"Discarding this circuit." + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.description) +msgid "" +"You get the best security that Tor can provide when you leave the route " +"selection to Tor; overriding the entry / exit nodes can compromise your " +"anonymity." +msgstr "让 Tor 选择路由会给你带来最高的安全性，修改中继节点可能会破坏你的匿名性。" + +#: http//localhost/tormobile/tormobile-5/ +#: (content/tormobile/tormobile-5/contents+en.lrquestion.description) +msgid "" +"Please watch our <a " +"href=\"https://blog.torproject.org\">blog</a> for future " +"announcements and details regarding this project." +msgstr "" +"请查看我们的 <a href=\"https://blog. Tor project.org\">博客</a> " +"获取关于将来这个项目的细节与公告。" + +#: http//localhost/gettor/gettor-1/ +#: (content/gettor/gettor-1/contents+en.lrquestion.title) +#: http//localhost/censorship/censorship-3/ +#: (content/censorship/censorship-3/contents+en.lrquestion.title) +msgid "How do I download Tor if the torproject.org is blocked?" +msgstr "torproject.org 被屏蔽了，怎么下载 Tor？" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" +msgstr "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" + +#: http//localhost/tormobile/tormobile-4/ +#: (content/tormobile/tormobile-4/contents+en.lrquestion.seo_slug) +msgid "run-tor-on-windows-phone" +msgstr "在 Windows Phone 上运行 Tor" + +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "Log notice file /var/log/tor/notices.log" +msgstr "Log notice file /var/log/ Tor /notices.log" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.title) +msgid "Can I change the number of hops Tor uses?" +msgstr "我能修改 Tor 网络中的跳跃次数吗？" + +#: http//localhost/tbb/tbb-2/ +#: (content/tbb/tbb-2/contents+en.lrquestion.description) +msgid "The first relay in your circuit is called an \"entry guard\" or \"guard\"." +msgstr "您连接的中继回路中的第一个节点通常被称为“入口节点”或是“中转节点\"。" + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.title) +msgid "Can I pick which country I'm exiting from?" +msgstr "我可以选择出口节点的所在地吗？" + +#: http//localhost/misc/misc-12/ +#: (content/misc/misc-12/contents+en.lrquestion.seo_slug) +msgid "share-files-anonymously-through-tor" +msgstr "使用 Tor 匿名的分享文件" + +#: http//localhost/tbb/tbb-40/ +#: (content/tbb/tbb-40/contents+en.lrquestion.description) +msgid "In Tor Browser, every new domain gets its own circuit." +msgstr "Tor Browser 中，每一个新的羽毛会分配到一条独立的链路。" + +#: http//localhost/tormessenger/ +#: (content/tormessenger/contents+en.lrtopic.seo_slug) +msgid "tor-messenger" +msgstr "Tor Messenger" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "## Set the nickname of this relay" +msgstr "## Set the nickname of this relay" + +#: http//localhost/tbb/tbb-22/ +#: (content/tbb/tbb-22/contents+en.lrquestion.title) +msgid "" +"How can I make Tor run faster? Is Tor Browser slower than other browsers?" +msgstr "如何能使 Tor 运行得更快? Tor Browser 比其他的浏览器更慢吗?" + +#: http//localhost/tbb/tbb-29/ +#: (content/tbb/tbb-29/contents+en.lrquestion.description) +msgid "" +"This option does not clear any private information or unlink your activity, " +"nor does it affect your current connections to other websites." +msgstr "这个选项不会清除任何私密信息或者取消关联你的活动，也不会影响你当前与其它网站的连接。" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "Install the ntp or openntpd (or similar) package to keep it that way." +msgstr "* 你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" + +#: http//localhost/tbb/tbb-27/ +#: (content/tbb/tbb-27/contents+en.lrquestion.description) +msgid "" +"The Torbutton icon (the little onion in the top left corner of the browser) " +"will display a yellow triangle." +msgstr "Torbutton 图标（浏览器左上角的洋葱图标）会显示一个黄色的三角形。" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy" +msgstr "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy" + +#: http//localhost/operators/ (content/operators/contents+en.lrtopic.title) +msgid "Operators" +msgstr "中继操作者" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* Русский (ru)" +msgstr "* 俄语" + +#: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.seo_slug) +msgid "tor-mobile" +msgstr "移动设备上的 Tor" + +#: http//localhost/tbb/tbb-18/ +#: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug) +msgid "is-there-support-for-bsd" +msgstr "支持 BSD 吗" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +msgid "" +"Look for a log entry in your /var/log/syslog such as \"Self-testing " +"indicates your ORPort is reachable from the outside. Excellent.\"" +msgstr "" +"查找日志中例如 \"Self-testing indicates your ORPort is reachable from the outside. " +"Excellent.\" 这样的日志记录。" + +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.seo_slug) +msgid "i-cannot-reach-x-dot-onion" +msgstr "我无法访问X.onion" + +#: http//localhost/tbb/tbb-41/ +#: (content/tbb/tbb-41/contents+en.lrquestion.title) +msgid "Why did my search engine switch to DuckDuckGo?" +msgstr "为什么我的搜索引擎换成了DuckDuckGo?" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"Bridges are useful for Tor users under oppressive regimes, and for people " +"who want an extra layer of security because they're worried somebody will " +"recognize that they are contacting a public Tor relay IP address." +msgstr "如果你处于某个压迫政权中，或是担心被发现自己正在和 Tor 中继的 IP 地址连接，你可能需要使用网桥。" + +#: http//localhost/faq/faq-2/ +#: (content/faq/faq-2/contents+en.lrquestion.description) +#: http//localhost/tbb/tbb-8/ +#: (content/tbb/tbb-8/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-1/ +#: (content/censorship/censorship-1/contents+en.lrquestion.description) +msgid "" +"For more information, please see the <a href=\"https://tb-" +"manual.torproject.org/en-US/\">Tor Browser User Manual</a> section on" +" <a href=\"https://tb-manual.torproject.org/en-" +"US/circumvention.html\">censorship</a>." +msgstr "" +"参阅 <a href=\"https://tb-manual.torproject.org/en-US/\">Tor Browser " +"用户手册</a>关于<a href=\"https://tb-manual.torproject.org/en-" +"US/circumvention.html\">审查</a>的章节获得更多信息。" + +#: http//localhost/tbb/tbb-20/ +#: (content/tbb/tbb-20/contents+en.lrquestion.description) +msgid "" +"If this doesn't fix the problem, see the Troubleshooting page on the " +"<a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor " +"Browser manual</a>." +msgstr "" +"如果这个问题还没有被解决，请查看位于<a href=\"https://tb-manual. Tor project.org/en-" +"US/bridges.html\"> Tor Browser 手册</a>的故障排查界面。" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.description) +msgid "* 简体字 (zh-CN)" +msgstr "* 简体中文" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.seo_slug) +msgid "what-is-a-dot-onion" +msgstr "什么是 .onion " + +#: http//localhost/misc/misc-7/ +#: (content/misc/misc-7/contents+en.lrquestion.title) +msgid "" +"Does Tor Project offer email service or other privacy protecting web " +"services?" +msgstr "Tor Project 提供邮件服务或者其他保护隐私的互联网服务吗？" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +msgid "" +"* When it confirms that it's reachable, it will upload a \"server " +"descriptor\" to the directory authorities to let clients know what address, " +"ports, keys, etc your relay is using." +msgstr "* 当它确认可以连接的时候，它会发送“服务器描述符”到中继目录来让客户端知道它的地址、端口、密钥和你的节点使用的中继等信息。" + +#: http//localhost/tbb/tbb-13/ +#: (content/tbb/tbb-13/contents+en.lrquestion.description) +msgid "" +"If you need to be sure that all traffic will go through the Tor network, " +"take a look at the <a href=\"https://tails.boum.org/\">Tails live " +"operating system</a> which you can start on almost any computer from " +"a USB stick or a DVD." +msgstr "" +"如果您要确保所有流量都将通过 Tor 网络传输，请尝试能通过 USB 设备或 DVD 在几乎所有电脑上启动的<a " +"href=\"https://tails.boum.org/\">Tails </a> Live 操作系统。" + +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.title) +msgid "How do I run an exit relay on Debian?" +msgstr "我如何在 Debian 上运行出口节点？" + +#: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.title) +msgid "Tor Browser" +msgstr "Tor Browser" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "##### Common log error #3: Failed to complete TLS handshake" +msgstr "##### Common log error #3: Failed to complete TLS handshake" + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-2/ +#: (content/censorship/censorship-2/contents+en.lrquestion.description) +msgid "" +"I urge you to reconsider this decision; Tor is used by people all over the " +"world to protect their privacy and fight censorship." +msgstr "我建议您重新考虑这个决定; Tor 被世界各地的人用来保护隐私和对抗审查。" + +#: http//localhost/tbb/tbb-12/ +#: (content/tbb/tbb-12/contents+en.lrquestion.seo_slug) +msgid "using-flash-tor-browser" +msgstr "Tor Browser 和 Flash" + +#: http//localhost/misc/misc-1/ +#: (content/misc/misc-1/contents+en.lrquestion.title) +msgid "I have a compelling reason to trace a Tor user. Can you help?" +msgstr "我需要追查一个 Tor 用户，你们能帮助我吗？" + +#: http//localhost/onionservices/onionservices-2/ +#: (content/onionservices/onionservices-2/contents+en.lrquestion.description) +msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) +msgid "" +"13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" +msgstr "" +"13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"direc Tor y server" + +#: http//localhost/tbb/tbb-10/ +#: (content/tbb/tbb-10/contents+en.lrquestion.description) +msgid "" +"Please open your antivirus or malware protection software and look in the " +"settings for a \"whitelist\" or something similar." +msgstr "请打开你的防病毒软件（或反恶意软件工具）中的设置，寻找白名单或类似的选项。" + +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.seo_slug) +msgid "to-use-gettor-via-xmpp" +msgstr "通过 XMPP 使用 GetTor" + +#: http//localhost/tbb/tbb-35/ +#: (content/tbb/tbb-35/contents+en.lrquestion.description) +msgid "" +"Unfortunately, some websites deliver CAPTCHAs to Tor users, and we are not " +"able to remove CAPTCHAs from websites." +msgstr "十分不幸，有些网站要求 Tor 用户填写验证码，我们对此无能为力。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "$ sudo apt-get update" +msgstr "$ sudo apt-get update" + +#: http//localhost/tbb/tbb-4/ +#: (content/tbb/tbb-4/contents+en.lrquestion.seo_slug) +msgid "tor-browser-is-built-from-firefox-why" +msgstr "Tor Browser 为何基于 Firefox " + +#: http//localhost/tbb/tbb-12/ +#: (content/tbb/tbb-12/contents+en.lrquestion.title) +msgid "Can I use Flash in Tor Browser?" +msgstr "我可以在 Tor Browser上使用 Flash 吗？" + +#: http//localhost/tbb/tbb-40/ +#: (content/tbb/tbb-40/contents+en.lrquestion.description) +msgid "" +"<a href=\"https://www.torproject.org/projects/torbrowser/design" +"/#identifier-linkability\">The Design and Implementation of Tor " +"Browser</a> document further explains the thinking behind this " +"design." +msgstr "" +"<a href=\"https://www.torproject.org/projects/torbrowser/design" +"/#identifier-linkability\">Tor Browser 的设计和实现 </a>文档进一步解释了设计背后的思考。" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "This step is usually fast, but it may take a few minutes." +msgstr "这一步通常很快，不过有时会需要几分钟。" + +#: http//localhost/tbb/tbb-21/ +#: (content/tbb/tbb-21/contents+en.lrquestion.description) +msgid "" +"Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the " +"dialog window when Tor Browser is first connecting to the network." +msgstr "当 Tor Browser 第一次连接到网络时，点击窗口下方的“复制 Tor 日志到剪贴板”按钮。" + +#: http//localhost/tbb/tbb-19/ +#: (content/tbb/tbb-19/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-4/ +#: (content/censorship/censorship-4/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-6/ +#: (content/censorship/censorship-6/contents+en.lrquestion.description) +msgid "" +"You might be on a censored network, and so you should try using bridges." +msgstr "你所用的网络可能存在封锁，因此你应该试试使用桥。" + +#: http//localhost/misc/misc-11/ +#: (content/misc/misc-11/contents+en.lrquestion.description) +msgid "" +"We don't want to encourage people to use paths longer than this as it " +"increases load on the network without (as far as we can tell) providing any " +"more security." +msgstr "因为会增加网络的负载而且（据我们所知）不会提供任何额外的安全性，所以我们不鼓励使用比默认设置更长的路径长度。" + +#: http//localhost/tormobile/tormobile-3/ +#: (content/tormobile/tormobile-3/contents+en.lrquestion.seo_slug) +msgid "run-tor-on-ios" +msgstr "在 iOS 上运行 Tor" + +#: http//localhost/connecting/connecting-3/ +#: (content/connecting/connecting-3/contents+en.lrquestion.title) +#: http//localhost/onionservices/onionservices-3/ +#: (content/onionservices/onionservices-3/contents+en.lrquestion.title) +msgid "I cannot reach X.onion!" +msgstr "我无法访问X.onion！" + +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "ExtORPort auto" +msgstr "ExtORPort auto" + +#: http//localhost/tbb/tbb-37/ +#: (content/tbb/tbb-37/contents+en.lrquestion.title) +msgid "I need Tor Browser in a language that's not English." +msgstr "我需要 Tor Browser 提供英语之外的语言。" + +#: http//localhost/tbb/tbb-34/ +#: (content/tbb/tbb-34/contents+en.lrquestion.seo_slug) +msgid "tor-browser-js-enabled-default" +msgstr "Tor Browser 默认启用 JavaScript" + +#: http//localhost/misc/misc-9/ +#: (content/misc/misc-9/contents+en.lrquestion.seo_slug) +msgid "having-a-problem-updating-vidalia" +msgstr "在使用或是升级 Vidalia 的时候出现问题" + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.seo_slug) +msgid "pick-which-country-i-am-exiting" +msgstr "选择出口节点的所在地" + +#: http//localhost/operators/operators-1/ +#: (content/operators/operators-1/contents+en.lrquestion.description) +#: http//localhost/operators/operators-2/ +#: (content/operators/operators-2/contents+en.lrquestion.description) +#: http//localhost/operators/operators-3/ +#: (content/operators/operators-3/contents+en.lrquestion.description) +#: http//localhost/operators/operators-6/ +#: (content/operators/operators-6/contents+en.lrquestion.description) +msgid "" +"## Set your bandwidth rate (leave commented and Tor will run without " +"bandwidth caps)" +msgstr "" +"## Set your bandwidth rate (leave commented and Tor will run without " +"bandwidth caps)" + +#: http//localhost/tbb/tbb-41/ +#: (content/tbb/tbb-41/contents+en.lrquestion.description) +msgid "" +"With the release of Tor Browser 6.0.6, we switched to DuckDuckGo as the " +"primary search engine." +msgstr "Tor Browser 6.0.6 后使用 DuckDuckGo 作为内置搜索引擎。" + +#: http//localhost/operators/operators-4/ +#: (content/operators/operators-4/contents+en.lrquestion.description) +msgid "$ deb-src http://deb.torproject.org/torproject.org <version> main" +msgstr "$ deb-src http://deb. Tor project.org/ Tor project.org <version> main" + +#: http//localhost/tbb/tbb-36/ +#: (content/tbb/tbb-36/contents+en.lrquestion.description) +msgid "" +"We do not recommend running multiple instances of Tor Browser, and may not " +"work as anticipated on many platforms." +msgstr "我们不推荐同时运行多个 Tor Browser ，这种做法在许多平台上都可能会有无法预料的后果。" + +#: http//localhost/censorship/censorship-7/ +#: (content/censorship/censorship-7/contents+en.lrquestion.description) +msgid "" +"That means that ISPs or governments trying to block access to the Tor " +"network can't simply block all bridges." +msgstr "这意味着政府或 ISP 阻止 Tor 网络的尝试不能简单的封锁所有网桥。" + +#: http//localhost/faq/faq-3/ (content/faq/faq-3/contents+en.lrquestion.title) +#: http//localhost/tbb/tbb-14/ +#: (content/tbb/tbb-14/contents+en.lrquestion.title) +msgid "" +"Should I install a new add-on or extension in Tor Browser, like AdBlock Plus" +" or uBlock Origin?" +msgstr "我应该在 Tor Browser 中安装新的扩展程序吗，例如 AdBlock Plus 或者 uBlock Origin ?" + +#: http//localhost/tbb/tbb-16/ +#: (content/tbb/tbb-16/contents+en.lrquestion.description) +msgid "" +"Please note that VPNs do not have the same privacy properties as Tor, but " +"they will help solve some geolocation restriction issues." +msgstr "请注意，VPN 和 Tor 在隐私属性上是有区别的，但是 VPN 可以解决一些区域限制问题。" + +#: http//localhost/tbb/tbb-33/ +#: (content/tbb/tbb-33/contents+en.lrquestion.description) +msgid "Running Tor Browser does not make you act as a relay in the network." +msgstr "运行 Tor Browser 不会使你成为网络中的一个中继节点。" + +#: http//localhost/tbb/tbb-41/ +#: (content/tbb/tbb-41/contents+en.lrquestion.description) +msgid "" +"For a while now, Disconnect has had no access to Google search results which" +" we used in Tor Browser." +msgstr "我们以前在 Tor Browser 使用的 Disconnect 已经不能再从 Google 获得搜索结果。" + +#: http//localhost/gettor/gettor-4/ +#: (content/gettor/gettor-4/contents+en.lrquestion.title) +msgid "To use GetTor via XMPP (Jitsi, CoyIM)." +msgstr "通过 XMPP（Jitsi，CoyM）使用 GetTor。" + +#: http//localhost/tbb/tbb-4/ +#: (content/tbb/tbb-4/contents+en.lrquestion.description) +msgid "" +"While it is technically possible to use Tor with other browsers, you may " +"open yourself up to potential attacks or information leakage, so we strongly" +" discourage it." +msgstr "虽然你可以同时使用 Tor Browser 和其他的浏览器，但是同时使用其他浏览器会暴露你的身份信息。我们强烈建议您不要使用其他浏览器。" + +#: http//localhost/tbb/tbb-30/ +#: (content/tbb/tbb-30/contents+en.lrquestion.description) +msgid "" +"Some websites, such as banks or email providers, might interpret this as a " +"sign that your account has been compromised, and lock you out." +msgstr "有时候某些像是银行或电子邮件服务的网站会认为您的帐号被他人盗用了，因此自动将您的帐号锁定。" + +#: http//localhost/connecting/connecting-2/ +#: (content/connecting/connecting-2/contents+en.lrquestion.description) +msgid "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" +" please check your time, timezone, and date settings." +msgstr "" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" +" please check your time, timezone, and date settings." + +#: http//localhost/tbb/tbb-7/ +#: (content/tbb/tbb-7/contents+en.lrquestion.seo_slug) +msgid "website-blocking-access-over-tor" +msgstr "网站封锁了来自 Tor 网络的访问" + +#: http//localhost/misc/misc-2/ +#: (content/misc/misc-2/contents+en.lrquestion.description) +msgid "" +"If we wanted to block certain people from using Tor, we'd basically be " +"adding a backdoor to the software, which would open up our vulnerable users " +"to attacks from bad regimes and other adversaries." +msgstr "虽然我们仅需要增加一些软件后门就可以阻止某些人使用 Tor 网络，但是这会导致我们的用户遭更容易受到专制政权和其他组织的攻击。" + +#: templates/footer.html:5 +msgid "Our mission:" +msgstr "我们的任务:" + +#: templates/footer.html:5 +msgid "" +"to advance human rights and freedoms by creating and deploying free and open" +" source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "通过创建和部署自由和开源的匿名和隐私技术，支持他们不受限制的使用性，以及提高他们对科学和普世价值的认知，来促进人权和自由的发展。" + +#: templates/footer.html:24 +msgid "Subscribe to our Newsletter" +msgstr "订阅我们的新闻" + +#: templates/footer.html:25 +msgid "Get monthly updates and opportunities from the Tor Project" +msgstr "订阅我们每个月发布的消息" + +#: templates/footer.html:32 +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our " +msgstr "商标和版权声明，以及第三方使用规则可以在这里找到 " + +#: templates/layout.html:7 +msgid "Tor Project | Support" +msgstr "Tor Project | 支持" + +#: templates/navbar.html:4 +msgid "Tor Logo" +msgstr "Tor 标志" + +#: templates/navbar.html:40 +msgid "Download Tor Browser" +msgstr "下载 Tor Browser" + +#: templates/search.html:5 +msgid "Search" +msgstr "搜索" + +#: templates/macros/question.html:11 +msgid "Permalink" +msgstr "永久链接"

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 16 Oct '18

16 Oct '18

commit 467c1a0fbebc9ac64b34beac0801d401e7a1a5d8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 19:18:55 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 97 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 42 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index ac489a258..40c15c5c8 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -1982,7 +1982,7 @@ msgstr "" msgid "" "Have a separate IP address for your exit relay, and don't route your own " "traffic through it." -msgstr "" +msgstr "你的出口节点有一个独立的 IP 地址，而且不会传输你的流量。" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -2571,7 +2571,7 @@ msgid "" "When it confirms that it's reachable, it will upload a \"server descriptor\"" " to the directory authorities to let clients know what address, ports, keys," " etc your relay is using." -msgstr "" +msgstr "当它确认可以连接的时候，它会发送“服务器描述符”到中继目录来让客户端知道它的地址、端口、密钥和你的节点使用的中继等信息。" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -2673,7 +2673,7 @@ msgstr "如果你没看到这条消息，你的中继可能无法被访问。" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "DirPort 9030" -msgstr "" +msgstr "DirPort 9030" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -2793,6 +2793,8 @@ msgid "" "href=\"https://www.torproject.org/about/contact.html.en\">Contact " "us</a>." msgstr "" +"你想这样做吗？<a " +"href=\"https://www.torproject.org/about/contact.html.en\">联系我们</a>。" #: http//localhost/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.seo_slug) @@ -2893,7 +2895,7 @@ msgstr "Tor Project 和私密聊天" msgid "" "Instead, consider running your exit relay in a commercial facility that is " "supportive of Tor." -msgstr "" +msgstr "推荐在支持 Tor 的商业实体（例如某些 VPS 服务商 —— 译者注）上搭建 Tor 的出口节点。" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -3620,28 +3622,28 @@ msgstr "这个选项不会清除任何私密信息或者取消关联你的活动 #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "Install the ntp or openntpd (or similar) package to keep it that way." -msgstr "* 你可以安装 ntp / openntpd 等软件来确保时间正确。" +msgstr "* 你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "" "The Torbutton icon (the little onion in the top left corner of the browser) " "will display a yellow triangle." -msgstr "" +msgstr "Torbutton 图标（浏览器左上角的洋葱图标）会显示一个黄色的三角形。" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy" -msgstr "" +msgstr "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy" #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title) msgid "Operators" -msgstr "选项" +msgstr "中继操作者" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) msgid "* Русский (ru)" -msgstr "" +msgstr "* 俄语" #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.seo_slug) msgid "tor-mobile" @@ -3650,7 +3652,7 @@ msgstr "移动设备上的 Tor" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug) msgid "is-there-support-for-bsd" -msgstr "支持BSD吗" +msgstr "支持 BSD 吗" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.description) @@ -3658,11 +3660,13 @@ msgid "" "Look for a log entry in your /var/log/syslog such as \"Self-testing " "indicates your ORPort is reachable from the outside. Excellent.\"" msgstr "" +"查找日志中例如 \"Self-testing indicates your ORPort is reachable from the outside. " +"Excellent.\" 这样的日志记录。" #: http//localhost/onionservices/onionservices-3/ #: (content/onionservices/onionservices-3/contents+en.lrquestion.seo_slug) msgid "i-cannot-reach-x-dot-onion" -msgstr "" +msgstr "我无法访问X.onion" #: http//localhost/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.title) @@ -3675,7 +3679,7 @@ msgid "" "Bridges are useful for Tor users under oppressive regimes, and for people " "who want an extra layer of security because they're worried somebody will " "recognize that they are contacting a public Tor relay IP address." -msgstr "" +msgstr "如果你处于某个压迫政权中，或是担心被发现自己正在和 Tor 中继的 IP 地址连接，你可能需要使用网桥。" #: http//localhost/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -3689,6 +3693,9 @@ msgid "" " <a href=\"https://tb-manual.torproject.org/en-" "US/circumvention.html\">censorship</a>." msgstr "" +"参阅 <a href=\"https://tb-manual.torproject.org/en-US/\">Tor Browser " +"用户手册</a>关于<a href=\"https://tb-manual.torproject.org/en-" +"US/circumvention.html\">审查</a>的章节获得更多信息。" #: http//localhost/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.description) @@ -3703,12 +3710,12 @@ msgstr "" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) msgid "* 简体字 (zh-CN)" -msgstr "" +msgstr "* 简体中文" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.seo_slug) msgid "what-is-a-dot-onion" -msgstr "" +msgstr "什么是 .onion " #: http//localhost/misc/misc-7/ #: (content/misc/misc-7/contents+en.lrquestion.title) @@ -3725,7 +3732,7 @@ msgid "" "* When it confirms that it's reachable, it will upload a \"server " "descriptor\" to the directory authorities to let clients know what address, " "ports, keys, etc your relay is using." -msgstr "" +msgstr "* 当它确认可以连接的时候，它会发送“服务器描述符”到中继目录来让客户端知道它的地址、端口、密钥和你的节点使用的中继等信息。" #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -3735,13 +3742,13 @@ msgid "" "operating system</a> which you can start on almost any computer from " "a USB stick or a DVD." msgstr "" -"如果您要确保所有流量都将通过 Tor 网络，请尝试能通过USB棒或DVD在几乎所有电脑上启动的<a " -"href=\"https://tails.boum.org/\">Tails 实时操作系统</a> 。" +"如果您要确保所有流量都将通过 Tor 网络传输，请尝试能通过 USB 设备或 DVD 在几乎所有电脑上启动的<a " +"href=\"https://tails.boum.org/\">Tails </a> Live 操作系统。" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.title) msgid "How do I run an exit relay on Debian?" -msgstr "" +msgstr "我如何在 Debian 上运行出口节点？" #: http//localhost/tbb/ (content/tbb/contents+en.lrtopic.title) msgid "Tor Browser" @@ -3752,7 +3759,7 @@ msgstr "Tor Browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "##### Common log error #3: Failed to complete TLS handshake" -msgstr "" +msgstr "##### Common log error #3: Failed to complete TLS handshake" #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -3761,22 +3768,22 @@ msgstr "" msgid "" "I urge you to reconsider this decision; Tor is used by people all over the " "world to protect their privacy and fight censorship." -msgstr "" +msgstr "我建议您重新考虑这个决定; Tor 被世界各地的人用来保护隐私和对抗审查。" #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.seo_slug) msgid "using-flash-tor-browser" -msgstr "" +msgstr "Tor Browser 和 Flash" #: http//localhost/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.title) msgid "I have a compelling reason to trace a Tor user. Can you help?" -msgstr "我必须追查一个 Tor 用户，你们能帮助我吗？" +msgstr "我需要追查一个 Tor 用户，你们能帮助我吗？" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -3794,19 +3801,19 @@ msgstr "" msgid "" "Please open your antivirus or malware protection software and look in the " "settings for a \"whitelist\" or something similar." -msgstr "" +msgstr "请打开你的防病毒软件（或反恶意软件工具）中的设置，寻找白名单或类似的选项。" #: http//localhost/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.seo_slug) msgid "to-use-gettor-via-xmpp" -msgstr "" +msgstr "通过 XMPP 使用 GetTor" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) msgid "" "Unfortunately, some websites deliver CAPTCHAs to Tor users, and we are not " "able to remove CAPTCHAs from websites." -msgstr "十分不幸，有些网站要求Tor用户填写验证码，我们对此无能为力。" +msgstr "十分不幸，有些网站要求 Tor 用户填写验证码，我们对此无能为力。" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -3816,12 +3823,12 @@ msgstr "$ sudo apt-get update" #: http//localhost/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.seo_slug) msgid "tor-browser-is-built-from-firefox-why" -msgstr "" +msgstr "Tor Browser 为何基于 Firefox " #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.title) msgid "Can I use Flash in Tor Browser?" -msgstr "我可以在 Tor Browser上使用flash吗？" +msgstr "我可以在 Tor Browser上使用 Flash 吗？" #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.description) @@ -3831,6 +3838,8 @@ msgid "" "Browser</a> document further explains the thinking behind this " "design." msgstr "" +"<a href=\"https://www.torproject.org/projects/torbrowser/design" +"/#identifier-linkability\">Tor Browser 的设计和实现 </a>文档进一步解释了设计背后的思考。" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -3841,14 +3850,14 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "This step is usually fast, but it may take a few minutes." -msgstr "" +msgstr "这一步通常很快，不过有时会需要几分钟。" #: http//localhost/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) msgid "" "Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the " "dialog window when Tor Browser is first connecting to the network." -msgstr "" +msgstr "当 Tor Browser 第一次连接到网络时，点击窗口下方的“复制 Tor 日志到剪贴板”按钮。" #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description) @@ -3866,7 +3875,7 @@ msgid "" "We don't want to encourage people to use paths longer than this as it " "increases load on the network without (as far as we can tell) providing any " "more security." -msgstr "" +msgstr "因为会增加网络的负载而且（据我们所知）不会提供任何额外的安全性，所以我们不鼓励使用比默认设置更长的路径长度。" #: http//localhost/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.seo_slug) @@ -3898,12 +3907,12 @@ msgstr "Tor Browser 默认启用 JavaScript" #: http//localhost/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.seo_slug) msgid "having-a-problem-updating-vidalia" -msgstr "" +msgstr "在使用或是升级 Vidalia 的时候出现问题" #: http//localhost/tbb/tbb-16/ #: (content/tbb/tbb-16/contents+en.lrquestion.seo_slug) msgid "pick-which-country-i-am-exiting" -msgstr "" +msgstr "选择出口节点的所在地" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -3917,6 +3926,8 @@ msgid "" "## Set your bandwidth rate (leave commented and Tor will run without " "bandwidth caps)" msgstr "" +"## Set your bandwidth rate (leave commented and Tor will run without " +"bandwidth caps)" #: http//localhost/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -3950,7 +3961,7 @@ msgstr "这意味着政府或 ISP 阻止 Tor 网络的尝试不能简单的封 msgid "" "Should I install a new add-on or extension in Tor Browser, like AdBlock Plus" " or uBlock Origin?" -msgstr "我应该在Tor Browser里安装新的扩展程序吗? 例如AdBlock Plus或者uBlock Origin?" +msgstr "我应该在 Tor Browser 中安装新的扩展程序吗，例如 AdBlock Plus 或者 uBlock Origin ?" #: http//localhost/tbb/tbb-16/ #: (content/tbb/tbb-16/contents+en.lrquestion.description) @@ -3982,14 +3993,14 @@ msgid "" "While it is technically possible to use Tor with other browsers, you may " "open yourself up to potential attacks or information leakage, so we strongly" " discourage it." -msgstr "虽然你可以同时使用 Tor Browser和其他的浏览器，但是同时使用其他浏览器会暴露你的身份信息。我们强烈建议您不要使用其他浏览器。" +msgstr "虽然你可以同时使用 Tor Browser 和其他的浏览器，但是同时使用其他浏览器会暴露你的身份信息。我们强烈建议您不要使用其他浏览器。" #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) msgid "" "Some websites, such as banks or email providers, might interpret this as a " "sign that your account has been compromised, and lock you out." -msgstr "有时候某些像是银行或电子邮件服务的网站会认为您的帐号被他人盗用了，因此自动将您的帐号锁定，要解决此情况的唯。" +msgstr "有时候某些像是银行或电子邮件服务的网站会认为您的帐号被他人盗用了，因此自动将您的帐号锁定。" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -3999,8 +4010,10 @@ msgid "" " 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" " please check your time, timezone, and date settings." msgstr "" -"19.11.2017 00:04:48.800 [警告] " -"收到NETINFO单位的时间(OR:xxx.xx.x.xx:xxxx):我们的时间似乎慢了1天，0小时，1分钟或者他们的时间快了。Tor需要准确的时间才能运行，请检查你的时间，时区和日期的设置。" +"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " +"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," +" 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" +" please check your time, timezone, and date settings." #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.seo_slug) @@ -4013,7 +4026,7 @@ msgid "" "If we wanted to block certain people from using Tor, we'd basically be " "adding a backdoor to the software, which would open up our vulnerable users " "to attacks from bad regimes and other adversaries." -msgstr "如果我们想阻止某些人使用TOR网络，我们仅需要增加一些软件后门，但是这会导致我们的用户遭到邪恶统治政府和其他组织的攻击。" +msgstr "虽然我们仅需要增加一些软件后门就可以阻止某些人使用 Tor 网络，但是这会导致我们的用户遭更容易受到专制政权和其他组织的攻击。" #: templates/footer.html:5 msgid "Our mission:" @@ -4033,7 +4046,7 @@ msgstr "订阅我们的新闻" #: templates/footer.html:25 msgid "Get monthly updates and opportunities from the Tor Project" -msgstr "订阅我们每个月发布的消息和机遇" +msgstr "订阅我们每个月发布的消息" #: templates/footer.html:32 msgid "" @@ -4043,11 +4056,11 @@ msgstr "商标和版权声明，以及第三方使用规则可以在这里找到 #: templates/layout.html:7 msgid "Tor Project | Support" -msgstr "Tor项目|支持" +msgstr "Tor Project | 支持" #: templates/navbar.html:4 msgid "Tor Logo" -msgstr "Tor标识" +msgstr "Tor 标志" #: templates/navbar.html:40 msgid "Download Tor Browser"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 16 Oct '18

16 Oct '18

commit 9d03aca3f9b0094bd5d8f98e39f05cb8551f1c38 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 19:15:18 2018 +0000 Update translations for donatepages-messagespot --- locale/zh_CN/LC_MESSAGES/messages.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index a8468bd16..aa240831e 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -3,39 +3,40 @@ # erinm, 2018 # Mingye Wang <arthur200126(a)gmail.com>, 2018 # Chi-Hsun Tsai, 2018 +# ヨイツの賢狼ホロ <kenookamihoro(a)gmail.com>, 2018 msgid "" msgstr "" -"Last-Translator: Chi-Hsun Tsai, 2018\n" +"Last-Translator: ヨイツの賢狼ホロ <kenookamihoro(a)gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:34 msgid "Tor Privacy Policy" -msgstr "" +msgstr "Tor 隐私政策" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44 msgid "Donor privacy policy" -msgstr "" +msgstr "捐助人隐私政策" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:58 msgid "" "The Tor Project respects donor privacy and welcomes anonymous donations." -msgstr "" +msgstr "Tor Project 尊重捐助人的隐私而且欢迎匿名捐赠。" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:60 msgid "" "If being anonymous is important to you, the best way to preserve your " "anonymity is by donating using a method that doesn't disclose your personal " "information." -msgstr "" +msgstr "如果保持匿名对你来说非常重要，最好的方法就是使用一种不会暴露你的个人信息的方法完成捐赠。" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65 msgid "" "If you provide personal information as part of the donation process, it may " "be collected and retained by third-party service providers and/or the Tor " "Project, as described below." -msgstr "" +msgstr "如果在捐赠过程中你提供了个人信息，这些信息可能会被 Tor Project 和/或如下所述的第三方服务提供商收集和储存。" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:67 msgid ""

1 0

[tor-browser-build/master] Bug 27218: generate multiple bundles in parallel
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit dfa0cc46fc0ef70f78313a651bffe178b4d1c4ee Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 10 01:33:59 2018 +0200 Bug 27218: generate multiple bundles in parallel --- projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 9e8cddb..250a0e9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -5,6 +5,9 @@ export TORBROWSER_VERSION='[% c("version") %]' mkdir -p $distdir +scripts_dir=/var/tmp/build_scripts +mkdir -p "$scripts_dir" + OUTDIR='[% dest_dir _ "/" _ c("filename") %]' mkdir -p $OUTDIR @@ -260,8 +263,6 @@ popd mv $distdir/tbb-windows-installer ${TB_STAGE_DIR} [% END %] -cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR - [% IF c("var/windows") %] TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] @@ -270,6 +271,11 @@ cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR TBDIR="$distdir/$PKG_DIR/Browser" [% END %] +cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF +#!/bin/bash +set -e +cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" rm -f precomplete python $MARTOOLS/createprecomplete.py @@ -279,8 +285,8 @@ cd $distdir [% IF c("var/build_mar") -%] # Create full MAR file and compressed package. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] [% IF c("var/linux") %] @@ -306,6 +312,7 @@ cd $distdir popd [% END %] rm -rf $distdir/${PKG_DIR} +SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] @@ -322,6 +329,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; + SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; IF c("var/osx"); SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); @@ -330,6 +338,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET browserdir = tbdir _ '/Browser'; END; %] + cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF +#!/bin/bash + set -e cp -a ${TB_STAGE_DIR} [% tbdir %] cp [% xpi %] "[% browserdir %]/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" @@ -357,9 +368,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $MARTOOLS/createprecomplete.py popd + cd $distdir + # Create full MAR file and compressed package for this locale. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]" + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" [% IF c("var/linux") %] [% SET tardir = 'tor-browser_' _ lang; c('tar', { @@ -388,5 +400,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ popd [% END %] rm -rf [% tbdir %] +SCRIPT_EOF [% END %] [% END %] + +chmod 775 $rootdir/run_scripts "$scripts_dir"/* +$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1647b77..7b44d8f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -6,6 +6,14 @@ var: container: use_container: 1 ddmg: '[% INCLUDE ddmg.sh %]' + deps: + - python + - libparallel-forkmanager-perl + - libfile-slurp-perl + - zip + - unzip + - bzip2 + - xz-utils targets: linux-i686: @@ -17,14 +25,9 @@ targets: osx-x86_64: var: mar_osname: osx64 - deps: + arch_deps: - genisoimage - - zip - - unzip - - python - - bzip2 - faketime - - xz-utils windows: var: arch_deps: @@ -41,6 +44,7 @@ targets: input_files: - project: container-image + - filename: run_scripts - project: firefox name: firefox - project: tor diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index a715300..97fddb1 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -4,8 +4,8 @@ find [% src %] ! -executable -exec chmod 0644 {} \; find [% src %] -exec [% c("var/touch") %] {} \; -dmg_tmpdir=$(mktemp -d) -[% SET filelist = '"$dmg_tmpdir/filelist.txt"' %] +dmg_tmpdir=\$(mktemp -d) +[% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] @@ -13,9 +13,9 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelis export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "\$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 -dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] +dmg dmg "\$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] popd -rm -Rf "$dmg_tmpdir" +rm -Rf "\$dmg_tmpdir" diff --git a/projects/tor-browser/run_scripts b/projects/tor-browser/run_scripts new file mode 100755 index 0000000..4b85b50 --- /dev/null +++ b/projects/tor-browser/run_scripts @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w +use strict; + +use Parallel::ForkManager; +use File::Slurp; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error "Wrong number of arguments" unless @ARGV == 2; +my ($nb_threads, $scripts_dir) = @ARGV; +exit_error "Could not enter $scripts_dir" unless chdir $scripts_dir; +my $pm = Parallel::ForkManager->new($nb_threads); +$pm->run_on_finish( + sub { + my ($pid, $exit, $id) = @_; + exit_error "Error running $id" unless $exit == 0; + print "Finished $id\n"; + } +); +foreach my $script (sort(read_dir($scripts_dir))) { + $pm->start($script) and next; + print "Running $script\n"; + exit_error "Error running $script" unless system("./$script") == 0; + $pm->finish; +} +$pm->wait_all_children;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_27218_v4'
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit d0bd427db75d980be121b12f30f59f18c4e47325 Merge: c65b5af dfa0cc4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 16 18:02:12 2018 +0000 Merge remote-tracking branch 'boklm/bug_27218_v4' projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-)

1 0

Jump to page: