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

[tor/master] test: HTTP CONNECT protocol
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 4264717ca377464b5304df0e3a322afaef72d812 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Oct 22 01:55:23 2019 +0800 test: HTTP CONNECT protocol --- src/test/test_connection.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 36543b3af..34ef3fdf1 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -316,13 +316,7 @@ test_conn_download_status_teardown(const struct testcase_t *tc, void *arg) static void * test_conn_proxy_connect_setup(const struct testcase_t *tc) { - tcp_proxy_protocol_t proxy_type = (tcp_proxy_protocol_t)tc->setup_data; - switch (proxy_type) { - case TCP_PROXY_PROTOCOL_HAPROXY: - return test_conn_get_proxy_or_connection(PROXY_HAPROXY); - default: - return NULL; - } + return test_conn_get_proxy_or_connection(*(unsigned int *)tc->setup_data); } static int @@ -818,6 +812,25 @@ test_conn_download_status(void *arg) /* the teardown function removes all the connections in the global list*/; } +static void +test_conn_https_proxy_connect(void *arg) +{ + size_t sz; + char *buf = NULL; + or_connection_t *conn = arg; + + MOCK(connection_or_change_state, mock_connection_or_change_state); + + tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_HTTPS_WANT_CONNECT_OK); + + buf = buf_get_contents(conn->base_.outbuf, &sz); + tt_str_op(buf, OP_EQ, "CONNECT 127.0.0.1:12345 HTTP/1.0\r\n\r\n"); + + done: + UNMOCK(connection_or_change_state); + tor_free(buf); +} + static int handshake_start_called = 0; static int @@ -957,6 +970,9 @@ test_failed_orconn_tracker(void *arg) #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } +static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT; +static const unsigned int PROXY_HAPROXY_ARG = PROXY_HAPROXY; + struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), @@ -966,9 +982,12 @@ struct testcase_t connection_tests[] = { test_conn_download_status_st, FLAV_MICRODESC), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, test_conn_download_status_st, FLAV_NS), + + CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, - test_conn_proxy_connect_st, - TCP_PROXY_PROTOCOL_HAPROXY), + test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), + //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES

1 0

[tor/master] circuit: Add change file
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 14d781fff6bd88c4e0cd5b741629c3e79c8612d9 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Mon Dec 2 15:24:44 2019 +0800 circuit: Add change file --- changes/ticket31518 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31518 b/changes/ticket31518 new file mode 100644 index 000000000..8deac56b9 --- /dev/null +++ b/changes/ticket31518 @@ -0,0 +1,6 @@ + o Major features (proxy): + - In addition to HTTP CONNECT, SOCKS4, and SOCKS5, Tor can make all OR + connections through the HAProxy server. A new torrc option was added to + specify the address/port of the server: TCPProxy <protocol> + <host>:<port>. Currently the only supported protocol in the option is + haproxy. Close ticket 31518. Patch done by Suphanat Chunhapanya (haxxpop).

1 0

[tor/master] Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1b63eea66cbb8793a3cff05de8d856ce3b93fc17 Merge: 9276c07a9 14d781fff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:41:20 2020 -0500 Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged changes/ticket31518 | 6 + doc/tor.1.txt | 16 ++ src/app/config/config.c | 89 +++++++- src/app/config/config.h | 2 + src/app/config/or_options_st.h | 11 + src/core/include.am | 2 + src/core/mainloop/connection.c | 341 ++++++++++++++++++----------- src/core/mainloop/connection.h | 4 +- src/core/or/connection_or.c | 26 ++- src/core/or/connection_or.h | 7 + src/core/or/or.h | 5 +- src/core/or/or_connection_st.h | 2 +- src/core/proto/.may_include | 6 +- src/core/proto/proto_haproxy.c | 45 ++++ src/core/proto/proto_haproxy.h | 12 + src/feature/client/transports.c | 3 + src/feature/control/btrack_orconn_cevent.c | 1 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_config.c | 47 ++++ src/test/test_connection.c | 96 +++++++- src/test/test_connection.h | 1 + src/test/test_helpers.c | 81 +++++++ src/test/test_helpers.h | 3 + src/test/test_options.c | 9 +- src/test/test_proto_haproxy.c | 66 ++++++ 27 files changed, 731 insertions(+), 153 deletions(-) diff --cc doc/tor.1.txt index 85369dfce,5bcb6ec2b..e1738c9ba --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -880,63 -910,8 +880,79 @@@ forward slash (/) in the configuration If KIST is used in Schedulers, this is a multiplier of the per-socket limit calculation of the KIST algorithm. (Default: 1.0) -CLIENT OPTIONS --------------- + +[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__:: + When this option is set, Tor will suggest __IP__:__PORT__ as the + listening address of any pluggable transport proxy that tries to + launch __transport__. (IPv4 addresses should written as-is; IPv6 + addresses should be wrapped in square brackets.) (Default: none) + +[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...:: + When this option is set, Tor will pass the __k=v__ parameters to + any pluggable transport proxy that tries to launch __transport__. + + (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) (Default: none) + +[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec __path-to-binary__ [options]:: + The Tor relay launches the pluggable transport proxy in __path-to-binary__ + using __options__ as its command-line options, and expects to receive + proxied client traffic from it. (Default: none) + +[[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]:: + Tor will make all OR connections through the SOCKS 4 proxy at host:port + (or host:1080 if port is not specified). + +[[Socks5Proxy]] **Socks5Proxy** __host__[:__port__]:: + Tor will make all OR connections through the SOCKS 5 proxy at host:port + (or host:1080 if port is not specified). + +// Out of order because Username logically precedes Password +[[Socks5ProxyUsername]] **Socks5ProxyUsername** __username__ + + +[[Socks5ProxyPassword]] **Socks5ProxyPassword** __password__:: + If defined, authenticate to the SOCKS 5 server using username and password + in accordance to RFC 1929. Both username and password must be between 1 and + 255 characters. + +[[SyslogIdentityTag]] **SyslogIdentityTag** __tag__:: + When logging to syslog, adds a tag to the syslog identity such that + log entries are marked with "Tor-__tag__". Can not be changed while tor is + running. (Default: none) + ++[[TCPProxy]] **TCPProxy** __protocol__ __host__:__port__:: ++ Tor will use the given protocol to make all its OR (SSL) connections through ++ a TCP proxy on host:port, rather than connecting directly to servers. You may ++ want to set **FascistFirewall** to restrict the set of ports you might try to ++ connect to, if your proxy only allows connecting to certain ports. There is no ++ equivalent option for directory connections, because all Tor client versions ++ that support this option download directory documents via OR connections. + +++ ++ The only protocol supported right now 'haproxy'. This option is only for ++ clients. (Default: none) + +++ ++ The HAProxy version 1 proxy protocol is described in detail at ++ https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt + +++ ++ Both source IP address and source port will be set to zero. ++ +[[TruncateLogFile]] **TruncateLogFile** **0**|**1**:: + If 1, Tor will overwrite logs at startup and in response to a HUP signal, + instead of appending to them. (Default: 0) + +[[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**:: + If this option is set to 0, don't allow the filesystem group to read and + write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make + the Unix socket readable and writable by the default GID. (Default: 0) + +[[UseDefaultFallbackDirs]] **UseDefaultFallbackDirs** **0**|**1**:: + Use Tor's default hard-coded FallbackDirs (if any). (When a + FallbackDir line is present, it replaces the hard-coded FallbackDirs, + regardless of the value of UseDefaultFallbackDirs.) (Default: 1) + +[[User]] **User** __Username__:: + On startup, setuid to this user and setgid to their primary group. + Can not be changed while tor is running. + +== CLIENT OPTIONS The following options are useful only for clients (that is, if **SocksPort**, **HTTPTunnelPort**, **TransPort**, **DNSPort**, or diff --cc src/app/config/config.c index 72ab065fb,c67f547cf..65a4dcb0e --- a/src/app/config/config.c +++ b/src/app/config/config.c @@@ -538,8 -522,9 +538,9 @@@ static const config_var_t option_vars_[ V(Socks5Proxy, STRING, NULL), V(Socks5ProxyUsername, STRING, NULL), V(Socks5ProxyPassword, STRING, NULL), + V(TCPProxy, STRING, NULL), - VAR("KeyDirectory", FILENAME, KeyDirectory_option, NULL), - V(KeyDirectoryGroupReadable, BOOL, "0"), + VAR_IMMUTABLE("KeyDirectory", FILENAME, KeyDirectory_option, NULL), + V(KeyDirectoryGroupReadable, AUTOBOOL, "auto"), VAR_D("HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), VAR_D("HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL), V(KeepalivePeriod, INTERVAL, "5 minutes"), diff --cc src/app/config/config.h index 15c935246,aa2b052c0..2c03714fd --- a/src/app/config/config.h +++ b/src/app/config/config.h @@@ -286,6 -259,15 +286,8 @@@ STATIC const struct config_mgr_t *get_o STATIC void or_options_free_(or_options_t *options); STATIC int options_validate_single_onion(or_options_t *options, char **msg); -STATIC int options_validate(or_options_t *old_options, - or_options_t *options, - or_options_t *default_options, - int from_setconf, char **msg); -STATIC int parse_transport_line(const or_options_t *options, - const char *line, int validate_only, - int server); + STATIC int parse_tcp_proxy_line(const char *line, or_options_t *options, + char **msg); STATIC int consider_adding_dir_servers(const or_options_t *options, const or_options_t *old_options); STATIC void add_default_trusted_dir_authorities(dirinfo_type_t type); diff --cc src/test/test_connection.c index 0d2827670,34ef3fdf1..736998128 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@@ -888,8 -969,10 +970,11 @@@ test_failed_orconn_tracker(void *arg /* where arg is an expression (constant, variable, compound expression) */ #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } +#endif /* !defined(COCCI) */ + static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT; + static const unsigned int PROXY_HAPROXY_ARG = PROXY_HAPROXY; + struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), diff --cc src/test/test_helpers.c index 29743a0d1,f972aca5b..31bf1fcc2 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@@ -16,9 -17,10 +17,10 @@@ #include "lib/buf/buffers.h" #include "app/config/config.h" -#include "lib/confmgt/confparse.h" +#include "lib/confmgt/confmgt.h" #include "app/main/subsysmgr.h" #include "core/mainloop/connection.h" + #include "core/or/connection_or.h" #include "lib/crypt_ops/crypto_rand.h" #include "core/mainloop/mainloop.h" #include "feature/nodelist/nodelist.h" diff --cc src/test/test_options.c index b99ae7893,394aff45b..ce05eb01f --- a/src/test/test_options.c +++ b/src/test/test_options.c @@@ -2801,23 -2946,27 +2801,24 @@@ test_options_validate__proxy(void *igno tor_free(msg); free_options_test_data(tdata); - tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "Socks4Proxy 215.1.1.1\n" + tdata = get_options_test_data("Socks4Proxy 215.1.1.1\n" "Socks5Proxy 215.1.1.2\n" ); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); + ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, -1); tt_str_op(msg, OP_EQ, "You have configured more than one proxy type. " - "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + "(Socks4Proxy|Socks5Proxy|HTTPSProxy|TCPProxy)"); tor_free(msg); free_options_test_data(tdata); - tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "HttpProxy 215.1.1.1\n" - ); + tdata = get_options_test_data("HttpProxy 215.1.1.1\n"); mock_clean_saved_logs(); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); + ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, 0); - expect_log_msg("HTTPProxy configured, but no SOCKS " - "proxy or HTTPS proxy configured. Watch out: this configuration " - "will proxy unencrypted directory connections only.\n"); + expect_log_msg("HTTPProxy configured, but no SOCKS proxy, " + "HTTPS proxy, or any other TCP proxy configured. Watch out: " + "this configuration will proxy unencrypted directory " + "connections only.\n"); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] config: Add TCPProxy option for haproxy protocol
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 5a6a6ed33c400c93387f388e3b8fb109d7047f2f Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Wed Aug 21 14:56:32 2019 +0800 config: Add TCPProxy option for haproxy protocol Read the TCPProxy option and put in or_options_t. --- src/app/config/config.c | 89 ++++++++++++++++++++++++++++++++++++++---- src/app/config/config.h | 2 + src/app/config/or_options_st.h | 11 ++++++ src/test/test_options.c | 9 +++-- 4 files changed, 99 insertions(+), 12 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index deda2448b..c67f547cf 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -522,6 +522,7 @@ static const config_var_t option_vars_[] = { V(Socks5Proxy, STRING, NULL), V(Socks5ProxyUsername, STRING, NULL), V(Socks5ProxyPassword, STRING, NULL), + V(TCPProxy, STRING, NULL), VAR("KeyDirectory", FILENAME, KeyDirectory_option, NULL), V(KeyDirectoryGroupReadable, BOOL, "0"), VAR_D("HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), @@ -4150,19 +4151,28 @@ options_validate(or_options_t *old_options, or_options_t *options, } } + if (options->TCPProxy) { + int res = parse_tcp_proxy_line(options->TCPProxy, options, msg); + if (res < 0) { + return res; + } + } + /* Check if more than one exclusive proxy type has been enabled. */ if (!!options->Socks4Proxy + !!options->Socks5Proxy + - !!options->HTTPSProxy > 1) + !!options->HTTPSProxy + !!options->TCPProxy > 1) REJECT("You have configured more than one proxy type. " - "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + "(Socks4Proxy|Socks5Proxy|HTTPSProxy|TCPProxy)"); /* Check if the proxies will give surprising behavior. */ if (options->HTTPProxy && !(options->Socks4Proxy || options->Socks5Proxy || - options->HTTPSProxy)) { - log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy or " - "HTTPS proxy configured. Watch out: this configuration will " - "proxy unencrypted directory connections only."); + options->HTTPSProxy || + options->TCPProxy)) { + log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy, " + "HTTPS proxy, or any other TCP proxy configured. Watch out: " + "this configuration will proxy unencrypted directory " + "connections only."); } if (options->Socks5ProxyUsername) { @@ -5962,6 +5972,68 @@ parse_bridge_line(const char *line) return bridge_line; } +/** Parse the contents of a TCPProxy line from line and put it + * in options. Return 0 if the line is well-formed, and -1 if it + * isn't. + * + * This will mutate only options->TCPProxyProtocol, options->TCPProxyAddr, + * and options->TCPProxyPort. + * + * On error, tor_strdup an error explanation into *msg. + */ +STATIC int +parse_tcp_proxy_line(const char *line, or_options_t *options, char **msg) +{ + int ret = 0; + tor_assert(line); + tor_assert(options); + tor_assert(msg); + + smartlist_t *sl = smartlist_new(); + /* Split between the protocol and the address/port. */ + smartlist_split_string(sl, line, " ", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); + + /* The address/port is not specified. */ + if (smartlist_len(sl) < 2) { + *msg = tor_strdup("TCPProxy has no address/port. Please fix."); + goto err; + } + + char *protocol_string = smartlist_get(sl, 0); + char *addrport_string = smartlist_get(sl, 1); + + /* The only currently supported protocol is 'haproxy'. */ + if (strcasecmp(protocol_string, "haproxy")) { + *msg = tor_strdup("TCPProxy protocol is not supported. Currently " + "the only supported protocol is 'haproxy'. " + "Please fix."); + goto err; + } else { + /* Otherwise, set the correct protocol. */ + options->TCPProxyProtocol = TCP_PROXY_PROTOCOL_HAPROXY; + } + + /* Parse the address/port. */ + if (tor_addr_port_lookup(addrport_string, &options->TCPProxyAddr, + &options->TCPProxyPort) < 0) { + *msg = tor_strdup("TCPProxy address/port failed to parse or resolve. " + "Please fix."); + goto err; + } + + /* Success. */ + ret = 0; + goto end; + + err: + ret = -1; + end: + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_free(sl); + return ret; +} + /** Read the contents of a ClientTransportPlugin or ServerTransportPlugin * line from line, depending on the value of server. Return 0 * if the line is well-formed, and -1 if it isn't. @@ -6110,9 +6182,10 @@ parse_transport_line(const or_options_t *options, /* ClientTransportPlugins connecting through a proxy is managed only. */ if (!server && (options->Socks4Proxy || options->Socks5Proxy || - options->HTTPSProxy)) { + options->HTTPSProxy || options->TCPProxy)) { log_warn(LD_CONFIG, "You have configured an external proxy with another " - "proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + "proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy|" + "TCPProxy)"); goto err; } diff --git a/src/app/config/config.h b/src/app/config/config.h index 44f09e5ee..aa2b052c0 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -266,6 +266,8 @@ STATIC int options_validate(or_options_t *old_options, STATIC int parse_transport_line(const or_options_t *options, const char *line, int validate_only, int server); +STATIC int parse_tcp_proxy_line(const char *line, or_options_t *options, + char **msg); STATIC int consider_adding_dir_servers(const or_options_t *options, const or_options_t *old_options); STATIC void add_default_trusted_dir_authorities(dirinfo_type_t type); diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index ca2d5de2f..96702d61c 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -26,6 +26,12 @@ typedef enum {OUTBOUND_ADDR_EXIT, OUTBOUND_ADDR_OR, OUTBOUND_ADDR_EXIT_AND_OR, OUTBOUND_ADDR_MAX} outbound_addr_t; +/** Which protocol to use for TCPProxy. */ +typedef enum { + /** Use the HAProxy proxy protocol. */ + TCP_PROXY_PROTOCOL_HAPROXY +} tcp_proxy_protocol_t; + /** Configuration options for a Tor process. */ struct or_options_t { uint32_t magic_; @@ -423,6 +429,11 @@ struct or_options_t { char *Socks5ProxyUsername; /**< Username for SOCKS5 authentication, if any */ char *Socks5ProxyPassword; /**< Password for SOCKS5 authentication, if any */ + char *TCPProxy; /**< protocol and hostname:port to use as a proxy, if any. */ + tcp_proxy_protocol_t TCPProxyProtocol; /**< Derived from TCPProxy. */ + tor_addr_t TCPProxyAddr; /**< Derived from TCPProxy. */ + uint16_t TCPProxyPort; /**< Derived from TCPProxy. */ + /** List of configuration lines for replacement directory authorities. * If you just want to replace one class of authority at a time, * use the "Alternate*Authority" options below instead. */ diff --git a/src/test/test_options.c b/src/test/test_options.c index 69407a999..394aff45b 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2953,7 +2953,7 @@ test_options_validate__proxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); tt_str_op(msg, OP_EQ, "You have configured more than one proxy type. " - "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + "(Socks4Proxy|Socks5Proxy|HTTPSProxy|TCPProxy)"); tor_free(msg); free_options_test_data(tdata); @@ -2963,9 +2963,10 @@ test_options_validate__proxy(void *ignored) mock_clean_saved_logs(); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - expect_log_msg("HTTPProxy configured, but no SOCKS " - "proxy or HTTPS proxy configured. Watch out: this configuration " - "will proxy unencrypted directory connections only.\n"); + expect_log_msg("HTTPProxy configured, but no SOCKS proxy, " + "HTTPS proxy, or any other TCP proxy configured. Watch out: " + "this configuration will proxy unencrypted directory " + "connections only.\n"); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] doc: Add TCPProxy option
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1b07a2d7bf8cc868e2d904191e8c30b48b7ac216 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Aug 20 16:18:24 2019 +0800 doc: Add TCPProxy option TCPProxy is used for proxying all outgoing OR connections through some proxy with the protocol specified in the option. --- doc/tor.1.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 06bf022b1..5bcb6ec2b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -647,6 +647,22 @@ GENERAL OPTIONS in accordance to RFC 1929. Both username and password must be between 1 and 255 characters. +[[TCPProxy]] **TCPProxy** __protocol__ __host__:__port__:: + Tor will use the given protocol to make all its OR (SSL) connections through + a TCP proxy on host:port, rather than connecting directly to servers. You may + want to set **FascistFirewall** to restrict the set of ports you might try to + connect to, if your proxy only allows connecting to certain ports. There is no + equivalent option for directory connections, because all Tor client versions + that support this option download directory documents via OR connections. + ++ + The only protocol supported right now 'haproxy'. This option is only for + clients. (Default: none) + ++ + The HAProxy version 1 proxy protocol is described in detail at + https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt + ++ + Both source IP address and source port will be set to zero. + [[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit af9c85b9721323682031d8fc62935ac938f55101 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 21:25:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index fedde7503b..3c1dd0bff5 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3584,7 +3584,7 @@ msgstr "" #: https//support.torproject.org/tormobile/tormobile-7/ #: (content/tormobile/tormobile-7/contents+en.lrquestion.title) msgid "Is Tor Browser available on F-Droid?" -msgstr "" +msgstr "Можно ли скачать Tor Browser с ресурса F-Droid?" #: https//support.torproject.org/tormobile/tormobile-7/ #: (content/tormobile/tormobile-7/contents+en.lrquestion.description) @@ -4266,19 +4266,19 @@ msgstr "" #: https//support.torproject.org/https/https-2/ #: (content/https/https-2/contents+en.lrquestion.title) msgid "Can I browse normal HTTPS sites with Tor?" -msgstr "" +msgstr "Можно ли открывать обычные HTTPS-сайты через Tor?" #: https//support.torproject.org/https/https-2/ #: (content/https/https-2/contents+en.lrquestion.description) msgid "" "The short answer is: **Yes, you can browse normal HTTPS Sites using Tor.**" -msgstr "" +msgstr "Если коротко: **да, через Tor можно открывать обычные HTTPS-сайты.**" #: https//support.torproject.org/https/https-2/ #: (content/https/https-2/contents+en.lrquestion.description) msgid "" "HTTPS Connections are used to secure communications over computer networks." -msgstr "" +msgstr "HTTPS используется для защиты коммуникаций в компьютерных сетях." #: https//support.torproject.org/https/https-2/ #: (content/https/https-2/contents+en.lrquestion.description) @@ -4286,6 +4286,8 @@ msgid "" "You can [read more about HTTPS here](https://tb-manual.torproject.org" "/secure-connections/)." msgstr "" +"Подробнее о HTTPS можно прочесть [здесь](https://tb-manual.torproject.org" +"/secure-connections/)." #: https//support.torproject.org/https/https-2/ #: (content/https/https-2/contents+en.lrquestion.description) @@ -4294,6 +4296,9 @@ msgid "" " plugin which automatically switches thousands of sites from unencrypted " "\"HTTP\" to more private \"HTTPS\"." msgstr "" +"В Tor Browser установлено дополнение [HTTPS Everywhere](https://www.eff.org" +"/https-everywhere). Оно автоматически переключает сайт с незашифрованной " +"версии \"HTTP\" на более защищенную \"HTTPS\"." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.title) @@ -4456,18 +4461,18 @@ msgstr "" #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.title) msgid "Do I get better anonymity if I run a relay?" -msgstr "" +msgstr "Если я буду поддерживать шлюз, это даст мне больше анонимности?" #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description) msgid "Yes, you do get better anonymity against some attacks." -msgstr "" +msgstr "Да, у вас будет больше анонимности в определенных ситуациях риска." #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description) msgid "" "The simplest example is an attacker who owns a small number of Tor relays." -msgstr "" +msgstr "Простой пример: у самого злоумышленника есть несколько Tor-шлюзов." #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description) @@ -4476,6 +4481,8 @@ msgid "" "the connection originated at your computer or was relayed from somebody " "else." msgstr "" +"Злоумышленник увидит, что трафик исходит от вас, но не сможет узнать, " +"появился ли этот трафик на вашем компьютере или вы просто посредник." #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description) @@ -4484,6 +4491,10 @@ msgid "" " all of your incoming and outgoing traffic, then it's easy for them to learn" " which connections were relayed and which started at you." msgstr "" +"В некоторых случаях это не работает. Например, если злоумышленник имеет " +"возможность отслеживать весь ваш входящий и исходящий трафик. В этом случае " +"ему нетрудно выяснить, какие данные вы просто передаете, а какие изначально " +"ваши." #: https//support.torproject.org/operators/better-anonymity/ #: (content/operators/better-anonymity/contents+en.lrquestion.description)

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 5f15e9b2a2f82975c8e291d05563e60f2b9a0ee2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 20:45:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fr/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index aec284727b..cad3316880 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -3223,7 +3223,7 @@ msgid "" "of-- maybe you will :)" msgstr "" "Il existe probablement d’autres façons de faire un don anonyme auxquelles " -"nous n’avons pas pensé. Peut-être le ferez-vous ?:)" +"nous n’avons pas pensé. Peut-être en trouverez-vous ? :)" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:391 msgid ""

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 8e30e9467331c0edbde04f08cc2d96a2e42abad5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 20:21:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 50f632478c..fe0c014990 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,8 +3,7 @@ # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # Nicolas Perraut <n.perraut(a)gmail.com>, 2019 # erinm, 2019 -# AO <ao(a)localizationlab.org>, 2019 -# Mattias Uroz <matmay951(a)gmail.com>, 2019 +# AO <ao(a)localizationlab.org>, 2020 # msgid "" msgstr "" @@ -12,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Mattias Uroz <matmay951(a)gmail.com>, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -406,7 +405,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.description) msgid "Installing Tor Browser" -msgstr "Installation du Navigateur Tor" +msgstr "Installation du Navigateur Tor" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit e5d0fb2d96fc6821728ecb4a4a583ce1d67a3f19 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 20:19:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index 53437bc4c7..e7a0fafb98 100644 --- a/es.po +++ b/es.po @@ -7,7 +7,7 @@ # Edward Navarro, 2015 # el buve, 2015 # Emma Peel, 2015,2017-2019 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018-2019 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018-2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # Jose Luis Tirado <joseluis.tirado(a)gmail.com>, 2014-2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-01-06 20:04+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 1aa6ed528587d188d75123b2ea29869bc427ad09 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 20:17:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es.po b/es.po index 79daf23853..a54507bdf3 100644 --- a/es.po +++ b/es.po @@ -7,7 +7,7 @@ # Edward Navarro, 2015 # el buve, 2015 # Emma Peel, 2015,2017-2019 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018-2019 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018-2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # Jose Luis Tirado <joseluis.tirado(a)gmail.com>, 2014-2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-01-06 20:04+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,11 +121,11 @@ msgid "" "website.\\n\\nCheck your network connection, and restart Tails to try " "upgrading again.\\n\\nIf the problem persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Se produjo un error al actualizar la clave de firma.\\n\\nEsto impide determinar si una actualización está disponible en nuestro sitio web.\\n\\nComprueba tu conexión de red, y reinicia Tails para intentar actualizar de nuevo.\\n\\nISí se mantiene el problema, mira en file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" -msgstr "" +msgstr "Error al actualizar la clave de firma" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279 msgid "Error while checking for upgrades"

1 0