April 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Per-SOCKSPort configuration for bug 8117 fix.
by arma＠torproject.org 18 Apr '13

18 Apr '13

commit fa3c23773944788125db2f67bcb048376c17fec9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 16:17:06 2013 -0400 Per-SOCKSPort configuration for bug 8117 fix. This might be necessary if the bug8117 fix confuses any applications. Also add a changes file. --- changes/bug8117 | 13 +++++++++++++ doc/tor.1.txt | 14 +++++++++++++- src/or/buffers.c | 7 +++++-- src/or/config.c | 9 +++++++++ src/or/connection.c | 6 ++++++ src/or/or.h | 12 ++++++++++++ 6 files changed, 58 insertions(+), 3 deletions(-) diff --git a/changes/bug8117 b/changes/bug8117 new file mode 100644 index 0000000..910e805 --- /dev/null +++ b/changes/bug8117 @@ -0,0 +1,13 @@ + o Major bugfixes: + + - Many SOCKS5 clients, when configured to offer a username/password, + offer both username/password authentication and "no authentication". + Tor had previously preferred no authentication, but this was + problematic when trying to make applications get proper stream + isolation with IsolateSOCKSAuth. Now, on any SOCKS port with + IsolateSOCKSAuth turned on (which is the default), Tor selects + username/password authentication if it's offered. If this confuses your + application, you can disable it on a per-SOCKSPort basis via + PreferSOCKSNoAuth. Fixes bug 8117; bugfix on 0.2.3.3-alpha. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 773fccf..85f0835 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -860,7 +860,7 @@ The following options are useful only for clients (that is, if the same circuit. Currently, two addresses are "too close" if they lie in the same /16 range. (Default: 1) -**SOCKSPort** \['address':]__port__|**auto** [_isolation flags_]:: +**SOCKSPort** \['address':]__port__|**auto** [_flags_] [_isolation flags_]:: Open this port to listen for connections from SOCKS-speaking applications. Set this to 0 if you don't want to allow application connections via SOCKS. Set it to "auto" to have Tor pick a port for @@ -894,6 +894,18 @@ The following options are useful only for clients (that is, if port with the same session group. (By default, streams received on different SOCKSPorts, TransPorts, etc are always isolated from one another. This option overrides that behavior.) ++ + Other recognized _flags_ for a SOCKSPort are: + **PreferSOCKSNoAuth**;; + Ordinarily, when an application offers both "username/password + authentication" and "no authentication" to Tor via SOCKS5, Tor + selects username/password authentication so that IsolateSOCKSAuth can + work. This can confuse some applications, if they offer a + username/password combination then get confused when asked for + one. You can disable this behavior, so that Tor will select "No + authentication" when IsolateSOCKSAuth is disabled, or when this + option is set. + **SOCKSListenAddress** __IP__[:__PORT__]:: Bind to this address to listen for connections from Socks-speaking diff --git a/src/or/buffers.c b/src/or/buffers.c index 4554a02..c0868f4 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1773,6 +1773,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, if (req->socks_version != 5) { /* we need to negotiate a method */ unsigned char nummethods = (unsigned char)*(data+1); + int have_user_pass, have_no_auth; int r=0; tor_assert(!req->socks_version); if (datalen < 2u+nummethods) { @@ -1783,14 +1784,16 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return -1; req->replylen = 2; /* 2 bytes of response */ req->reply[0] = 5; /* socks5 reply */ - if (memchr(data+2, SOCKS_USER_PASS, nummethods)) { + have_user_pass = (memchr(data+2, SOCKS_USER_PASS, nummethods) !=NULL); + have_no_auth = (memchr(data+2, SOCKS_NO_AUTH, nummethods) !=NULL); + if (have_user_pass && !(have_no_auth && req->socks_prefer_no_auth)) { req->auth_type = SOCKS_USER_PASS; req->reply[1] = SOCKS_USER_PASS; /* tell client to use "user/pass" auth method */ req->socks_version = 5; /* remember we've already negotiated auth */ log_debug(LD_APP,"socks5: accepted method 2 (username/password)"); r=0; - } else if (memchr(data+2, SOCKS_NO_AUTH, nummethods)) { + } else if (have_no_auth) { req->reply[1] = SOCKS_NO_AUTH; /* tell client to use "none" auth method */ req->socks_version = 5; /* remember we've already negotiated auth */ diff --git a/src/or/config.c b/src/or/config.c index 90a5dfb..a80576e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5787,6 +5787,7 @@ parse_port_config(smartlist_t *out, int port; int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT; + int prefer_no_auth = 0; char *addrport; uint16_t ptmp=0; @@ -5916,6 +5917,11 @@ parse_port_config(smartlist_t *out, no = 1; elt += 2; } + if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { + prefer_no_auth = ! no; + continue; + } + if (!strcasecmpend(elt, "s")) elt[strlen(elt)-1] = '\0'; /* kill plurals. */ @@ -5959,6 +5965,9 @@ parse_port_config(smartlist_t *out, cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only; + cfg->socks_prefer_no_auth = prefer_no_auth; + if (! (isolation & ISO_SOCKSAUTH)) + cfg->socks_prefer_no_auth = 1; smartlist_add(out, cfg); } diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..aeb4949 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1056,6 +1056,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, lis_conn->session_group = global_next_session_group--; } } + lis_conn->socks_prefer_no_auth = port_cfg->socks_prefer_no_auth; if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for listener failed. Giving up."); @@ -1238,6 +1239,11 @@ connection_handle_listener_read(connection_t *conn, int new_type) newconn->port = port; newconn->address = tor_dup_addr(&addr); + if (new_type == CONN_TYPE_AP) { + TO_ENTRY_CONN(newconn)->socks_request->socks_prefer_no_auth = + TO_LISTENER_CONN(conn)->socks_prefer_no_auth; + } + } else if (conn->socket_family == AF_UNIX) { /* For now only control ports can be Unix domain sockets * and listeners at the same time */ diff --git a/src/or/or.h b/src/or/or.h index 51c23d3..ca28c0e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1085,6 +1085,10 @@ typedef struct listener_connection_t { /** One or more ISO_ flags to describe how to isolate streams. */ uint8_t isolation_flags; /**@}*/ + /** For SOCKS connections only: If this is set, we will choose "no + * authentication" instead of "username/password" authentication if both + * are offered. Used as input to parse_socks. */ + unsigned int socks_prefer_no_auth : 1; } listener_connection_t; @@ -2910,6 +2914,10 @@ typedef struct port_cfg_t { uint8_t isolation_flags; /**< Zero or more isolation flags */ int session_group; /**< A session group, or -1 if this port is not in a * session group. */ + /* Socks only: */ + /** When both no-auth and user/pass are advertised by a SOCKS client, select + * no-auth. */ + unsigned int socks_prefer_no_auth : 1; /* Server port types (or, dir) only: */ unsigned int no_advertise : 1; @@ -3729,6 +3737,10 @@ struct socks_request_t { * make sure we send back a socks reply for * every connection. */ unsigned int got_auth : 1; /**< Have we received any authentication data? */ + /** If this is set, we will choose "no authentication" instead of + * "username/password" authentication if both are offered. Used as input to + * parse_socks. */ + unsigned int socks_prefer_no_auth : 1; /** Number of bytes in username; 0 if username is NULL */ size_t usernamelen;

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug7302' into maint-0.2.4
by arma＠torproject.org 18 Apr '13

18 Apr '13

commit ee3cc44f27b6620ad25a20bb16fcffe23ca66663 Merge: 7f50af1 805ecb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:42:54 2013 -0400 Merge remote-tracking branch 'public/bug7302' into maint-0.2.4 Conflicts: src/or/status.c changes/bug7302 | 11 +++++++++++ src/or/control.c | 3 +++ src/or/status.c | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --cc src/or/status.c index e44de63,6a43fc4..d239e6e --- a/src/or/status.c +++ b/src/or/status.c @@@ -85,7 -86,7 +86,8 @@@ log_heartbeat(time_t now char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; + double r = tls_get_write_overhead_ratio(); + const int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); (void)now;

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4
by arma＠torproject.org 18 Apr '13

18 Apr '13

commit 7f50af116f2497a73fe9113e814a5765047cf3ca Merge: 6acf0ac fa3c237 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:39:26 2013 -0400 Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4 Conflicts: doc/tor.1.txt src/or/config.c src/or/connection.c changes/bug8117 | 13 +++++++++++++ doc/tor.1.txt | 9 +++++++++ src/or/buffers.c | 17 ++++++++++------- src/or/config.c | 7 +++++++ src/or/connection.c | 6 ++++++ src/or/or.h | 12 ++++++++++++ 6 files changed, 57 insertions(+), 7 deletions(-) diff --cc doc/tor.1.txt index c502c57,85f0835..f35d639 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -927,52 -893,20 +927,61 @@@ The following options are useful only f on this port to share circuits with streams from every other port with the same session group. (By default, streams received on different SOCKSPorts, TransPorts, etc are always isolated from one - another. This option overrides that behavior.) + another. This option overrides that behavior.) + + Other recognized _flags_ for a SOCKSPort are: + **NoIPv4Traffic**;; + Tell exits to not connect to IPv4 addresses in response to SOCKS + requests on this connection. + **IPv6Traffic**;; + Tell exits to allow IPv6 addresses in response to SOCKS requests on + this connection, so long as SOCKS5 is in use. (SOCKS4 can't handle + IPv6.) + **PreferIPv6**;; + Tells exits that, if a host has both an IPv4 and an IPv6 address, + we would prefer to connect to it via IPv6. (IPv4 is the default.) + ++ + NOTE: Although this option allows you to specify an IP address + other than localhost, you should do so only with extreme caution. + The SOCKS protocol is unencrypted and (as we use it) + unauthenticated, so exposing it in this way could leak your + information to anybody watching your network, and allow anybody + to use your computer as an open proxy. + **CacheIPv4DNS**;; + Tells the client to remember IPv4 DNS answers we receive from exit + nodes via this connection. (On by default.) + **CacheIPv6DNS**;; + Tells the client to remember IPv6 DNS answers we receive from exit + nodes via this connection. + **CacheDNS**;; + Tells the client to remember all DNS answers we receive from exit + nodes via this connection. + **UseIPv4Cache**;; + Tells the client to use any cached IPv4 DNS answers we have when making + requests via this connection. (NOTE: This option, along UseIPv6Cache + and UseDNSCache, can harm your anonymity, and probably + won't help performance as much as you might expect. Use with care!) + **UseIPv6Cache**;; + Tells the client to use any cached IPv6 DNS answers we have when making + requests via this connection. + **UseDNSCache**;; + Tells the client to use any cached DNS answers we have when making + requests via this connection. + **PreferIPv6Automap**;; + When serving a hostname lookup request on this port that + should get automapped (according to AutomapHostsOnResove), + if we could return either an IPv4 or an IPv6 answer, prefer + an IPv6 answer. (On by default.) + **PreferSOCKSNoAuth**;; + Ordinarily, when an application offers both "username/password + authentication" and "no authentication" to Tor via SOCKS5, Tor + selects username/password authentication so that IsolateSOCKSAuth can + work. This can confuse some applications, if they offer a + username/password combination then get confused when asked for + one. You can disable this behavior, so that Tor will select "No + authentication" when IsolateSOCKSAuth is disabled, or when this + option is set. - **SOCKSListenAddress** __IP__[:__PORT__]:: Bind to this address to listen for connections from Socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. diff --cc src/or/config.c index ffa984b,a80576e..20a3c20 --- a/src/or/config.c +++ b/src/or/config.c @@@ -5142,40 -5917,9 +5143,43 @@@ parse_port_config(smartlist_t *out no = 1; elt += 2; } - if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { + + if (takes_hostnames) { + if (!strcasecmp(elt, "IPv4Traffic")) { + ipv4_traffic = ! no; + continue; + } else if (!strcasecmp(elt, "IPv6Traffic")) { + ipv6_traffic = ! no; + continue; + } else if (!strcasecmp(elt, "PreferIPv6")) { + prefer_ipv6 = ! no; + continue; + } + } + if (!strcasecmp(elt, "CacheIPv4DNS")) { + cache_ipv4 = ! no; + continue; + } else if (!strcasecmp(elt, "CacheIPv6DNS")) { + cache_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "CacheDNS")) { + cache_ipv4 = cache_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "UseIPv4Cache")) { + use_cached_ipv4 = ! no; + continue; + } else if (!strcasecmp(elt, "UseIPv6Cache")) { + use_cached_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "UseDNSCache")) { + use_cached_ipv4 = use_cached_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "PreferIPv6Automap")) { + prefer_ipv6_automap = ! no; + continue; ++ } else if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { + prefer_no_auth = ! no; + continue; } if (!strcasecmpend(elt, "s")) @@@ -5225,16 -5963,11 +5229,19 @@@ cfg->no_advertise = no_advertise; cfg->no_listen = no_listen; cfg->all_addrs = all_addrs; - cfg->ipv4_only = ipv4_only; - cfg->ipv6_only = ipv6_only; + cfg->bind_ipv4_only = bind_ipv4_only; + cfg->bind_ipv6_only = bind_ipv6_only; + cfg->ipv4_traffic = ipv4_traffic; + cfg->ipv6_traffic = ipv6_traffic; + cfg->prefer_ipv6 = prefer_ipv6; + cfg->cache_ipv4_answers = cache_ipv4; + cfg->cache_ipv6_answers = cache_ipv6; + cfg->use_cached_ipv4_answers = use_cached_ipv4; + cfg->use_cached_ipv6_answers = use_cached_ipv6; + cfg->prefer_ipv6_virtaddr = prefer_ipv6_automap; + cfg->socks_prefer_no_auth = prefer_no_auth; + if (! (isolation & ISO_SOCKSAUTH)) + cfg->socks_prefer_no_auth = 1; smartlist_add(out, cfg); } diff --cc src/or/connection.c index 2cc3d74,aeb4949..358a4ee --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1132,19 -1056,7 +1132,20 @@@ connection_listener_new(const struct so lis_conn->session_group = global_next_session_group--; } } + if (type == CONN_TYPE_AP_LISTENER) { + lis_conn->socks_ipv4_traffic = port_cfg->ipv4_traffic; + lis_conn->socks_ipv6_traffic = port_cfg->ipv6_traffic; + lis_conn->socks_prefer_ipv6 = port_cfg->prefer_ipv6; + } else { + lis_conn->socks_ipv4_traffic = 1; + lis_conn->socks_ipv6_traffic = 1; + } + lis_conn->cache_ipv4_answers = port_cfg->cache_ipv4_answers; + lis_conn->cache_ipv6_answers = port_cfg->cache_ipv6_answers; + lis_conn->use_cached_ipv4_answers = port_cfg->use_cached_ipv4_answers; + lis_conn->use_cached_ipv6_answers = port_cfg->use_cached_ipv6_answers; + lis_conn->prefer_ipv6_virtaddr = port_cfg->prefer_ipv6_virtaddr; + lis_conn->socks_prefer_no_auth = port_cfg->socks_prefer_no_auth; if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for listener failed. Giving up."); diff --cc src/or/or.h index 4e19140,ca28c0e..ece2bc7 --- a/src/or/or.h +++ b/src/or/or.h @@@ -1247,37 -1085,11 +1247,41 @@@ typedef struct listener_connection_t /** One or more ISO_ flags to describe how to isolate streams. */ uint8_t isolation_flags; /**@}*/ + /** For SOCKS connections only: If this is set, we will choose "no + * authentication" instead of "username/password" authentication if both + * are offered. Used as input to parse_socks. */ + unsigned int socks_prefer_no_auth : 1; + /** For a SOCKS listeners, these fields describe whether we should + * allow IPv4 and IPv6 addresses from our exit nodes, respectively. + * + * @{ + */ + unsigned int socks_ipv4_traffic : 1; + unsigned int socks_ipv6_traffic : 1; + /** @} */ + /** For a socks listener: should we tell the exit that we prefer IPv6 + * addresses? */ + unsigned int socks_prefer_ipv6 : 1; + + /** For a socks listener: should we cache IPv4/IPv6 DNS information that + * exit nodes tell us? + * + * @{ */ + unsigned int cache_ipv4_answers : 1; + unsigned int cache_ipv6_answers : 1; + /** @} */ + /** For a socks listeners: if we find an answer in our client-side DNS cache, + * should we use it? + * + * @{ */ + unsigned int use_cached_ipv4_answers : 1; + unsigned int use_cached_ipv6_answers : 1; + /** @} */ + /** For socks listeners: When we can automap an address to IPv4 or IPv6, + * do we prefer IPv6? */ + unsigned int prefer_ipv6_virtaddr : 1; + } listener_connection_t; /** Minimum length of the random part of an AUTH_CHALLENGE cell. */

1 0

[tor/release-0.2.4] Add src/or/micro-revision.i to CLEANFILES in case anybody has one
by arma＠torproject.org 18 Apr '13

18 Apr '13

commit 3dc52e6636b69f10717ddc10ff55426f73ca0068 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 17:53:38 2013 -0500 Add src/or/micro-revision.i to CLEANFILES in case anybody has one Fix for 7143. --- changes/bug7143 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug7143 b/changes/bug7143 new file mode 100644 index 0000000..d26135a --- /dev/null +++ b/changes/bug7143 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Add the old src/or/micro-revision.i filename to CLEANFILES. + On the off chance that somebody has one, it will go away as soon + as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha. diff --git a/src/or/include.am b/src/or/include.am index 2410154..d2be1fb 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -188,6 +188,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS) touch src/or/or_sha1.i; \ fi -CLEANFILES+= micro-revision.i +CLEANFILES+= micro-revision.i src/or/micro-revision.i FORCE:

1 0

[tor/release-0.2.4] Debugging log for bug 8185
by arma＠torproject.org 18 Apr '13

18 Apr '13

commit 7d1ade251bad76c82b3f1288097587e0fbd1c4ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 17:00:40 2013 -0400 Debugging log for bug 8185 If the bug recurs, log the filename and line number that triggered it --- changes/bug8185_diagnostic | 3 +++ src/or/relay.c | 22 +++++++++++++++------- src/or/relay.h | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/changes/bug8185_diagnostic b/changes/bug8185_diagnostic new file mode 100644 index 0000000..b0f8884 --- /dev/null +++ b/changes/bug8185_diagnostic @@ -0,0 +1,3 @@ + o Minor features: + - Improve debugging output to attempt to diagnose the underlying + cause of bug 8185. diff --git a/src/or/relay.c b/src/or/relay.c index 1da9932..c71fe2a 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -379,15 +379,22 @@ relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, static int circuit_package_relay_cell(cell_t *cell, circuit_t *circ, cell_direction_t cell_direction, - crypt_path_t *layer_hint, streamid_t on_stream) + crypt_path_t *layer_hint, streamid_t on_stream, + const char *filename, int lineno) { channel_t *chan; /* where to send the cell */ if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; - if (!CIRCUIT_IS_ORIGIN(circ) || !chan) { - log_warn(LD_BUG,"outgoing relay cell has n_chan==NULL. Dropping."); + if (!chan) { + log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL." + " Dropping.", filename, lineno); + return 0; /* just drop it */ + } + if (!CIRCUIT_IS_ORIGIN(circ)) { + log_warn(LD_BUG,"outgoing relay cell sent from %s:%d on non-origin " + "circ. Dropping.", filename, lineno); return 0; /* just drop it */ } @@ -548,9 +555,10 @@ relay_command_to_string(uint8_t command) * return 0. */ int -relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, - uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer) +relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, + uint8_t relay_command, const char *payload, + size_t payload_len, crypt_path_t *cpath_layer, + const char *filename, int lineno) { cell_t cell; relay_header_t rh; @@ -633,7 +641,7 @@ relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, } if (circuit_package_relay_cell(&cell, circ, cell_direction, cpath_layer, - stream_id) < 0) { + stream_id, filename, lineno) < 0) { log_warn(LD_BUG,"circuit_package_relay_cell failed. Closing."); circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); return -1; diff --git a/src/or/relay.h b/src/or/relay.h index 7e59838..229fb4f 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -20,9 +20,15 @@ int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, void relay_header_pack(uint8_t *dest, const relay_header_t *src); void relay_header_unpack(relay_header_t *dest, const uint8_t *src); -int relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, +int relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer); + size_t payload_len, crypt_path_t *cpath_layer, + const char *filename, int lineno); +#define relay_send_command_from_edge(stream_id, circ, relay_command, payload, \ + payload_len, cpath_layer) \ + relay_send_command_from_edge_((stream_id), (circ), (relay_command), \ + (payload), (payload_len), (cpath_layer), \ + __FILE__, __LINE__) int connection_edge_send_command(edge_connection_t *fromconn, uint8_t relay_command, const char *payload, size_t payload_len);

1 0

[torspec/master] Define 'family' better in path-spec
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 920edeeef60823d9efe196eb964a7465144d3ae9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 00:30:20 2013 -0400 Define 'family' better in path-spec Inspired by tor-talk thread "Family path selection" --- path-spec.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/path-spec.txt b/path-spec.txt index b6ada21..9575d25 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -188,7 +188,8 @@ of their choices. we generate obey the following constraints: - We do not choose the same router twice for the same path. - We do not choose any router in the same family as another in the same - path. + path. (Two routers are in the same family if each one lists the other + in the "family" entries of its descriptor.) - We do not choose more than one router in a given /16 subnet (unless EnforceDistinctSubnets is 0). - We don't choose any non-running or non-valid router unless we have

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 1a955fc54f42aa8da2e11cef132cef849cb06051 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 03:45:13 2013 +0000 Update translations for tsum --- pt/short-user-manual_pt_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/short-user-manual_pt_noimg.xhtml b/pt/short-user-manual_pt_noimg.xhtml index 56182d0..d432c5a 100644 --- a/pt/short-user-manual_pt_noimg.xhtml +++ b/pt/short-user-manual_pt_noimg.xhtml @@ -4,7 +4,7 @@ <title/> </head> <body> - <h1 id="the-short-user-manual">The Short User Manual</h1> + <h1 id="the-short-user-manual">Guia rápido de utilização</h1> <p>Este manual contém informações sobre como baixar o Tor, como usá-lo, e o que fazer se o Tor estiver disponível para se conectar à Internet. Se você não conseguir encontrar a resposta para sua questão neste documento, envie um e-mail para help(a)rt.torproject.org.</p> <p>Por favor, note que nós provemos suporte através de bases voluntárias, e temos vários e-mails todo dia. Não há motivo para se preocupar se não retornarmos à você rapidamente.</p> <h2 id="how-tor-works">Como Tor funciona</h2> @@ -15,12 +15,12 @@ <h2 id="how-to-download-tor">Como baixar o Tor</h2> <p>O pacote que recomendamos para a maioria dos usuário é o <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. Este pacote contém um navegador pré configurado para navegar seguramente através do Tor, e não requer instalação. Você baixa o pacote, extrai o arquivo, e inicia o Tor.</p> <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p> - <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3> + <h3 id="how-to-get-tor-via-email">Como obter o Tor via email</h3> <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p> <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p> <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p> <p><strong>Nota</strong>: Os pacotes do Tor Browser para Mac OS X e Linux são maiores, e você não estará habilitado para recebê-los através do Gmail, Hotmail ou Yahoo. Se você não receber o pacote que escolheu, envie um e-mail para help(a)rt.torproject.org e nós daremos a você uma lista de sites de onde poderá baixá-lo.</p> - <h3 id="tor-for-smartphones">Tor for smartphones</h3> + <h3 id="tor-for-smartphones">Tor para smartphones</h3> <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p> <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p> <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>

1 0

[tor-launcher/master] Suppress repeated bootstrap error alerts.
by brade＠torproject.org 17 Apr '13

17 Apr '13

commit 69c469efe1abc033224ea8219555e3aab9416a58 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 17 14:39:26 2013 -0400 Suppress repeated bootstrap error alerts. --- src/chrome/content/network-settings.js | 1 + src/components/tl-process.js | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 97dcf82..97e26d6 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -358,6 +358,7 @@ function applySettings() this.setConfAndReportErrors(settings); gProtocolSvc.TorSendCommand("SAVECONF"); + gTorProcessService.TorClearBootstrapError(); gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone; if (!gIsBootstrapComplete) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 4e73536..7781caf 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -210,6 +210,12 @@ TorProcessService.prototype = return this.mIsBootstrapDone; }, + TorClearBootstrapError: function() + { + this.mLastTorWarningPhase = null; + this.mLastTorWarningText = null; + }, + // Private Member Variables //////////////////////////////////////////////// mIsTorProcessReady: false, @@ -223,6 +229,8 @@ TorProcessService.prototype = mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. + mLastTorWarningPhase: null, + mLastTorWarningText: null, // Private Methods ///////////////////////////////////////////////////////// @@ -363,9 +371,16 @@ TorProcessService.prototype = TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true); TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.WARNING); - var s = TorLauncherUtil.getFormattedLocalizedString( + if ((aStatusObj.TAG != this.mLastTorWarningPhase) || + (aStatusObj.WARNING != this.mLastTorWarningText)) + { + var s = TorLauncherUtil.getFormattedLocalizedString( "tor_bootstrap_failed", [aStatusObj.WARNING], 1); - TorLauncherUtil.showAlert(null, s); + TorLauncherUtil.showAlert(null, s); + + this.mLastTorWarningPhase = aStatusObj.TAG; + this.mLastTorWarningText = aStatusObj.WARNING; + } } } }, // _processBootstrapStatus()

1 0

[tor-launcher/master] Bump version number. Remove update url.
by brade＠torproject.org 17 Apr '13

17 Apr '13

commit 0247c38d8758adfa301c2ae03a8b4dc1faad3331 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 17 13:56:28 2013 -0400 Bump version number. Remove update url. --- src/install.rdf | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index 72e180d..b9d69bb 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,16 +7,12 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>torlauncher(a)torproject.org</em:id> - <em:version>0.1.0pre-alpha</em:version> + <em:version>0.1.1pre-alpha</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en?TODO</em:homepageURL>  <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL> - -   <em:targetApplication> <Description>

1 0

[tor-launcher/master] Make error alerts children of network settings dialog (if it is open).
by brade＠torproject.org 17 Apr '13

17 Apr '13

commit 1600617412e36522429ecc60095fad62b90a4870 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 17 14:18:02 2013 -0400 Make error alerts children of network settings dialog (if it is open). --- src/chrome/content/network-settings.xul | 1 + src/modules/tl-util.jsm | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 06e817b..6e6c882 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -14,6 +14,7 @@ <dialog id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="&torsettings.dialog.title;" + windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" buttons="accept,cancel,extra1" buttonlabelextra1="&torsettings.copyLog;" diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 0de2f05..67cbfcd 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -36,7 +36,9 @@ let TorLauncherUtil = // Public { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Ci.nsIWindowMediator); - aParentWindow = wm.getMostRecentWindow("navigator:browser"); + aParentWindow = wm.getMostRecentWindow("TorLauncher:NetworkSettings"); + if (!aParentWindow) + aParentWindow = wm.getMostRecentWindow("navigator:browser"); } var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"]

1 0