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

[torsocks/master] connect: Always pass .onion IP cookie to connection object
by dgoulet＠torproject.org 20 Apr '18

20 Apr '18

commit 2fa559117c36e2e8e3996048a03c0bbc5c6984e8 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 20 11:24:05 2018 -0400 connect: Always pass .onion IP cookie to connection object Fixes #23876 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/lib/connect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/connect.c b/src/lib/connect.c index 7f5657c..854e994 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -156,10 +156,11 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) onion_pool_unlock(&tsocks_onion_pool); if (on_entry) { /* - * Create a connection without a destination address since we will set + * Create a connection with the onion IP cookie since getpeername() + * might need it, and set connection domain and hostname to use * the onion address name found before. */ - new_conn = connection_create(sockfd, NULL); + new_conn = connection_create(sockfd, addr); if (!new_conn) { errno = ENOMEM; goto error;

1 0

[torsocks/master] log: Avoid crash or file corruption when closing logs
by dgoulet＠torproject.org 20 Apr '18

20 Apr '18

commit e56313a0d59b9a396c260ed1ffcf4bc75d6e986a Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 20 11:49:58 2018 -0400 log: Avoid crash or file corruption when closing logs Fixes #24081 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/log.c | 38 +++++++++++++++++++++++++------------- src/common/log.h | 1 + src/lib/close.c | 6 ++++++ 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 8bf8836..60a56f7 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -145,20 +145,22 @@ int log_init(int level, const char *filepath, enum log_time_status t_status) } if (filepath) { - logconfig.fp = fopen(filepath, "a"); - if (!logconfig.fp) { - fprintf(stderr, "[tsocks] Unable to open log file %s\n", filepath); + logconfig.filepath = strdup(filepath); + if (!logconfig.filepath) { + perror("[tsocks] log init strdup"); ret = -errno; goto error; } - logconfig.filepath = strdup(filepath); - if (!logconfig.filepath) { - perror("[tsocks] log init strdup"); + logconfig.fp = fopen(filepath, "a"); + if (!logconfig.fp) { + fprintf(stderr, "[tsocks] Unable to open log file %s\n", filepath); + free(logconfig.filepath); + logconfig.filepath = NULL; ret = -errno; - fclose(logconfig.fp); goto error; } + setbuf(logconfig.fp, NULL); } else { /* The default output is stderr if no filepath is given. */ ret = fileno(stderr); @@ -182,12 +184,22 @@ ATTR_HIDDEN void log_destroy(void) { free(logconfig.filepath); - if (logconfig.fp) { - int ret; + logconfig.filepath = NULL; - ret = fclose(logconfig.fp); - if (ret) { - perror("[tsocks] fclose log destroy"); - } + /* Don't call fclose() because torsocks fclose() generates log messages and + * so calling it here could cause a loop. Just zero out the fp so it won't + * be used again. */ + logconfig.fp = NULL; +} + +/* + * Clean up if the fd for the log file gets closed. + */ +ATTR_HIDDEN +void log_fd_close_notify(int fd) +{ + if (fd >= 0 && logconfig.fp && (fd == fileno(logconfig.fp))) { + log_print("[tsocks] Log file descriptor closed. Stopping logging.\n"); + log_destroy(); } } diff --git a/src/common/log.h b/src/common/log.h index e3770df..49d7a77 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -51,6 +51,7 @@ extern int tsocks_loglevel; void log_print(const char *fmt, ...); int log_init(int level, const char *filepath, enum log_time_status t_status); void log_destroy(void); +void log_fd_close_notify(int fd); #define __tsocks_print(level, fmt, args...) \ do { \ diff --git a/src/lib/close.c b/src/lib/close.c index 4381514..0bf9ea7 100644 --- a/src/lib/close.c +++ b/src/lib/close.c @@ -52,6 +52,12 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG) connection_put_ref(conn); } + /* + * Let the log system detect when the log file fd is about to be + * closed and clean up. + */ + log_fd_close_notify(fd); + /* Return the original libc close. */ return tsocks_libc_close(fd); }

1 0

[torsocks/master] gethostbyaddr_r: Don't put garbage in data->hostname
by dgoulet＠torproject.org 20 Apr '18

20 Apr '18

commit 8013dfb1ebf6cb1d0a8751dcd3531e6b2e5aef39 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 20 12:04:35 2018 -0400 gethostbyaddr_r: Don't put garbage in data->hostname Fixes #25627 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/lib/gethostbyname.c | 5 ++++- tests/test_dns.c | 24 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index 296099e..df84e14 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -263,9 +263,12 @@ LIBC_GETHOSTBYADDR_R_RET_TYPE tsocks_gethostbyaddr_r(LIBC_GETHOSTBYADDR_R_SIG) /* This call allocates hostname. On error, it's untouched. */ ret = tsocks_tor_resolve_ptr(addr, &data->hostname, type); if (ret < 0) { + /* We can represent any IPv4 address in dotted quad notation in fewer than + * 32 bytes (max should be 16 if we count a nul terminator). */ + char addrbuf[32]; const char *ret_str; - ret_str = inet_ntop(type, addr, buf, buflen); + ret_str = inet_ntop(type, addr, &addrbuf[0], sizeof(addrbuf)); if (!ret_str) { ret = HOST_NOT_FOUND; if (errno == ENOSPC) { diff --git a/tests/test_dns.c b/tests/test_dns.c index 06fad12..7e07663 100644 --- a/tests/test_dns.c +++ b/tests/test_dns.c @@ -26,7 +26,7 @@ #include <tap/tap.h> #include "helpers.h" -#define NUM_TESTS 5 +#define NUM_TESTS 6 struct test_host { const char *name; @@ -76,6 +76,27 @@ static void test_gethostbyname(const struct test_host *host) return; } +static void test_gethostbyaddr_r_failed(void) +{ + int result; + in_addr_t addr; + struct hostent ret; + char buf[1024]; + int buflen = sizeof buf; + struct hostent *result_entp; + int h_errno; + + diag("gethostbyaddr_r test"); + + /* RFC 6890 - An address from TEST-NET-1. Selected in hopes that it will + + * _not_ reverse resolve to anything. + + */ + addr = inet_addr("192.0.2.1"); + result = gethostbyaddr_r((const void *)&addr, + INET_ADDRSTRLEN, AF_INET, &ret, buf, buflen, &result_entp, &h_errno); + ok(0 != result, "Impossible reverse resolve failed as desired."); +} + static void test_gethostbyaddr_r(const struct test_host *host) { int result; @@ -179,6 +200,7 @@ int main(int argc, char **argv) test_gethostbyname(&tor_dir_auth1); test_gethostbyaddr(&tor_dir_auth2); test_gethostbyaddr_r(&tor_dir_auth2); + test_gethostbyaddr_r_failed(); test_getaddrinfo(&tor_localhost); end:

1 0

[torsocks/master] gethostbyaddr_r: Populate h_addrtype field
by dgoulet＠torproject.org 20 Apr '18

20 Apr '18

commit a44660bd6d32de6c58a51eaad7c019f8e9131cf3 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 20 11:58:12 2018 -0400 gethostbyaddr_r: Populate h_addrtype field Fixes #25586 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/lib/gethostbyname.c | 1 + tests/test_dns.c | 51 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index e43ed4a..296099e 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -301,6 +301,7 @@ LIBC_GETHOSTBYADDR_R_RET_TYPE tsocks_gethostbyaddr_r(LIBC_GETHOSTBYADDR_R_SIG) he->h_aliases = NULL; he->h_length = strlen(he->h_name); + he->h_addrtype = type; /* Assign the address list within the data of the given buffer. */ data->addr_list[0] = (char *) addr; data->addr_list[1] = NULL; diff --git a/tests/test_dns.c b/tests/test_dns.c index 2d87744..06fad12 100644 --- a/tests/test_dns.c +++ b/tests/test_dns.c @@ -26,7 +26,7 @@ #include <tap/tap.h> #include "helpers.h" -#define NUM_TESTS 4 +#define NUM_TESTS 5 struct test_host { const char *name; @@ -76,26 +76,56 @@ static void test_gethostbyname(const struct test_host *host) return; } +static void test_gethostbyaddr_r(const struct test_host *host) +{ + int result; + in_addr_t addr; + struct hostent ret; + char buf[1024]; + int buflen = sizeof buf; + struct hostent *result_entp; + int h_errno; + + assert(host); + diag("gethostbyaddr_r test"); + + addr = inet_addr(host->ip); + result = gethostbyaddr_r((const void *)&addr, + INET_ADDRSTRLEN, AF_INET, &ret, buf, buflen, &result_entp, &h_errno); + + if (result) { + fail("Resolving address %s: %d", host->ip, result); + } + + if (strcmp(host->name, result_entp->h_name) != 0) { + fail("Wrong resolved name: %s", result_entp->h_name); + } + + if (result_entp->h_addrtype != AF_INET) { + fail("Wrong resolved address family: %d", result_entp->h_addrtype); + } + + ok(1, "Resolved address"); +} + static void test_gethostbyaddr(const struct test_host *host) { struct hostent *he; - in_addr_t addr; + in_addr_t addr; assert(host); diag("gethostbyaddr test"); - addr = inet_addr(host->ip); - - he = gethostbyaddr((const void *)&addr, INET_ADDRSTRLEN, AF_INET); - if (he) { - ok(strcmp(host->name, he->h_name) == 0, - "Resolving address %s", host->ip); - } else { + addr = inet_addr(host->ip); + he = gethostbyaddr((const void *)&addr, INET_ADDRSTRLEN, AF_INET); + if (he) { + ok(strcmp(host->name, he->h_name) == 0, "Resolving address %s", host->ip); + } else { fail("Resolving address %s", host->ip); } - return; + return; } static void test_getaddrinfo(const struct test_host *host) @@ -148,6 +178,7 @@ int main(int argc, char **argv) test_getaddrinfo(&tor_check); test_gethostbyname(&tor_dir_auth1); test_gethostbyaddr(&tor_dir_auth2); + test_gethostbyaddr_r(&tor_dir_auth2); test_getaddrinfo(&tor_localhost); end:

1 0

[depictor/master] Add known_params DoSCircuitCreationEnabled
by tom＠torproject.org 20 Apr '18

20 Apr '18

commit b9b5b95f5af577d859543dac8ec3dc206c940125 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Apr 20 10:32:03 2018 -0500 Add known_params DoSCircuitCreationEnabled --- data/consensus.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/data/consensus.cfg b/data/consensus.cfg index e4af54a..68be4c3 100644 --- a/data/consensus.cfg +++ b/data/consensus.cfg @@ -39,3 +39,4 @@ known_params NumDirectoryGuards known_params NumEntryGuards known_params Support022HiddenServices known_params hsdir_spread_store +known_params DoSCircuitCreationEnabled \ No newline at end of file

1 0

[depictor/master] Fix leading spaces, turn them into tabs
by tom＠torproject.org 20 Apr '18

20 Apr '18

commit 515885814845d42c87199dba4b0e85fda988cff6 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Apr 20 09:39:59 2018 -0500 Fix leading spaces, turn them into tabs --- website.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/website.py b/website.py index 4cfc7cf..02fbdce 100755 --- a/website.py +++ b/website.py @@ -1329,12 +1329,12 @@ class WebsiteWriter: + " }\n" + " let fps = $('#fingerprintBox').val().split(',');\n" + " let retrieveData = function(fullFP) {\n" - + " if (loadedRelays.indexOf(fullFP) >= 0) {\n" - + " return;\n" - + " }\n" - + " loadedRelays.push(fullFP);\n" - + " let rangeString = 'bytes=' + relayIndexes[fullFP].indexes[0] + '-' + relayIndexes[fullFP].indexes[1];\n" - + " console.log(\"Querying for \" + rangeString);\n" + + " if (loadedRelays.indexOf(fullFP) >= 0) {\n" + + " return;\n" + + " }\n" + + " loadedRelays.push(fullFP);\n" + + " let rangeString = 'bytes=' + relayIndexes[fullFP].indexes[0] + '-' + relayIndexes[fullFP].indexes[1];\n" + + " console.log(\"Querying for \" + rangeString);\n" + " $.ajax({\n" + " url: 'consensus-health.html',\n" + " headers: { 'Range' : rangeString },\n" @@ -1348,23 +1348,23 @@ class WebsiteWriter: + " let partialFP = fps[i].trim().toUpperCase();\n" + " let retrievedData = false;\n" + " if (partialFP in relayIndexes) {\n" - + " retrieveData(partialFP);\n" - + " retrievedData = true;\n" - + " } else {\n" - + " partialloop: for (r in relayIndexes) {\n" - + " if (relayIndexes[r].nickname.toUpperCase() == partialFP) {\n" - + " retrieveData(r);\n" - + " retrievedData = true;\n" - + " }\n" - + " if (r.startsWith(partialFP)) {\n" - + " retrieveData(r);\n" + + " retrieveData(partialFP);\n" + + " retrievedData = true;\n" + + " } else {\n" + + " partialloop: for (r in relayIndexes) {\n" + + " if (relayIndexes[r].nickname.toUpperCase() == partialFP) {\n" + + " retrieveData(r);\n" + " retrievedData = true;\n" - + " }\n" - + " }\n" - + " if (!retrievedData) {\n" - + " alert(\"Could not match \" + partialFP + \" to a full or partial fingerprint or a nickname.\");\n" - + " }\n" - + " }\n" + + " }\n" + + " if (r.startsWith(partialFP)) {\n" + + " retrieveData(r);\n" + + " retrievedData = true;\n" + + " }\n" + + " }\n" + + " if (!retrievedData) {\n" + + " alert(\"Could not match \" + partialFP + \" to a full or partial fingerprint or a nickname.\");\n" + + " }\n" + + " }\n" + " }\n" + " };\n" + " $('#relay-addition-javascript-pointer').html('But you can add individual "

1 0

[depictor/master] Allow Nickname to be case insensitive when searching
by tom＠torproject.org 20 Apr '18

20 Apr '18

commit 7795022d0ac9cd86c8ee5905c1393c0bdc6b41d5 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Apr 20 09:38:53 2018 -0500 Allow Nickname to be case insensitive when searching --- website.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website.py b/website.py index 9e12145..4cfc7cf 100755 --- a/website.py +++ b/website.py @@ -1345,18 +1345,18 @@ class WebsiteWriter: + " });\n" + " }\n" + " relayloop: for (i in fps) {\n" - + " let partialFP = fps[i].trim();\n" + + " let partialFP = fps[i].trim().toUpperCase();\n" + " let retrievedData = false;\n" - + " if (partialFP.toUpperCase() in relayIndexes) {\n" + + " if (partialFP in relayIndexes) {\n" + " retrieveData(partialFP);\n" + " retrievedData = true;\n" + " } else {\n" + " partialloop: for (r in relayIndexes) {\n" - + " if (relayIndexes[r].nickname == partialFP) {\n" + + " if (relayIndexes[r].nickname.toUpperCase() == partialFP) {\n" + " retrieveData(r);\n" + " retrievedData = true;\n" + " }\n" - + " if (r.startsWith(partialFP.toUpperCase())) {\n" + + " if (r.startsWith(partialFP)) {\n" + " retrieveData(r);\n" + " retrievedData = true;\n" + " }\n" @@ -1478,7 +1478,7 @@ class WebsiteWriter: import base64, binascii start = self.site.tell() #self.indexes.write(base64.b64encode(binascii.unhexlify(relay_fp)) + ":" + str(start)) - self.indexes.write(relay_fp + ":" + relay_nickname + ":" + str(start)) + self.indexes.write(relay_fp.upper() + ":" + relay_nickname + ":" + str(start)) self.site.write(" <tr>\n") if relay_fp in self.consensus.routers and \ "Named" in self.consensus.routers[relay_fp].flags and \

1 0

[depictor/master] Add Clock Skew. Closes #25767
by tom＠torproject.org 20 Apr '18

20 Apr '18

commit a91384c90639c71dad3486813f85b9bbf79bf2c4 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Apr 20 10:30:59 2018 -0500 Add Clock Skew. Closes #25767 --- data/consensus.cfg | 3 +++ utility.py | 28 +++++++++++++++++++++++++++ website.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++- write_website.py | 5 ++++- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/data/consensus.cfg b/data/consensus.cfg index 02f39b1..e4af54a 100644 --- a/data/consensus.cfg +++ b/data/consensus.cfg @@ -9,6 +9,9 @@ graph_logical_min 125 # do not show values values greater than this on the graph. You can leave this high graph_logical_max 25000 +# we highlight clockskew that is 20 seconds or greater +clockskew_threshold 20 + # recognized tor consensus parameters known_params bwweightscale diff --git a/utility.py b/utility.py old mode 100644 new mode 100755 index 6b2cfae..d4f9a68 --- a/utility.py +++ b/utility.py @@ -1,4 +1,7 @@ +#!/usr/bin/env python + import time +import urllib import datetime import stem.descriptor @@ -81,6 +84,26 @@ def _get_documents(label, resource): return documents, issues, runtimes +def get_clockskew(): + clockskew = {} + for (nickname, authority) in get_dirauths().items(): + authority_address = "http://" + str(authority.address) + ":" + str(authority.dir_port) + try: + startTimeStamp = datetime.datetime.utcnow() + startTime = time.time() + f = urllib.urlopen(authority_address) + for h in f.info().headers: + if h.upper().startswith('DATE:'): + clockskew[nickname] = datetime.datetime.strptime(h[6:].strip(), '%a, %d %b %Y %H:%M:%S %Z') + processing = time.time() - startTime + if processing > 5: + clockskew[nickname] -= datetime.timedelta(seconds=(processing / 2)) + clockskew[nickname] -= startTimeStamp + clockskew[nickname] = clockskew[nickname].total_seconds() + except: + continue + return clockskew + def unix_time(dt): return (dt - datetime.datetime.utcfromtimestamp(0)).total_seconds() * 1000.0 @@ -98,3 +121,8 @@ class FileMock(): pass def write(self, str): pass + +if __name__ == "__main__": + skew = get_clockskew() + for c in skew: + print c, skew[c] \ No newline at end of file diff --git a/website.py b/website.py index 02fbdce..d3fa842 100755 --- a/website.py +++ b/website.py @@ -24,6 +24,7 @@ class WebsiteWriter: consensus = None votes = None fallback_dirs = None + clockskew = None known_authorities = [] bandwidth_authorities = [] consensus_expiry = datetime.timedelta(hours=3) @@ -51,6 +52,7 @@ class WebsiteWriter: self._write_recommended_versions() self._write_consensus_parameters() self._write_authority_keys() + self._write_authority_clocks() self._write_shared_random() self._write_protocols() self._write_bandwidth_weights() @@ -82,6 +84,8 @@ class WebsiteWriter: self.known_params = config['known_params'] def set_fallback_dirs(self, fallback_dirs): self.fallback_dirs = fallback_dirs + def set_clockskew(self, clockskew): + self.clockskew = clockskew def get_consensus_time(self): return self.consensus.valid_after def all_votes_present(self): @@ -691,6 +695,55 @@ class WebsiteWriter: + "</p>\n") #----------------------------------------------------------------------------------------- + def _write_authority_clocks(self): + """ + Write authority clock skew + """ + self.site.write("<br>\n\n\n" + + " " + + "<a name=\"authorityclocks\">\n" + + "<h3><a href=\"#authorityclocks\" class=\"anchor\">" + + "Authority Clock Skew</a></h3>\n" + + "<br>\n" + + "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"160\">\n" + + " <col width=\"640\">\n" + + " </colgroup>\n" + + " <tr>\n" + + " <th>Name</th>" + + " <th>Approximate Clock Skew</th>" + + " </tr>\n") + + if not self.clockskew: + self.site.write(" <tr><td>(No clock skew data.)</td><td></td></tr>\n") + else: + for dirauth_nickname in self.known_authorities: + if dirauth_nickname in self.clockskew: + clock = self.clockskew[dirauth_nickname] + + if clock > self.config['clockskew_threshold']: + self.site.write(" <tr>\n" + + " <td class=\"oiv\">" + dirauth_nickname + "</td>\n" + + " <td class=\"oiv\">" + + str(clock) + " seconds</td>\n </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>" + + str(clock) + " seconds</td>\n </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td><span class=\"oiv\">Could not query authority<span></td>\n" + + " </tr>\n") + + self.site.write("</table>\n" + + "<br>\n" + + "<p><i>Times are roughly accurate, anything below a couple seconds should be fine. Please use this table as a guide rather than an authoritative source.</i>" + + "</p>\n") + + #----------------------------------------------------------------------------------------- def sharedRandomToStr(self, sr): s = "[" s += "V:" + str(sr.version) + " " @@ -1632,7 +1685,8 @@ if __name__ == '__main__': 'known_params': [], 'ignore_fallback_authorities': False, 'graph_logical_min': 125, - 'graph_logical_max': 25000 + 'graph_logical_max': 25000, + 'clockskew_threshold': 0, }) config = stem.util.conf.get_config("consensus") config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) diff --git a/write_website.py b/write_website.py index d8d3e3f..f79e2c3 100755 --- a/write_website.py +++ b/write_website.py @@ -48,7 +48,8 @@ CONFIG = stem.util.conf.config_dict('consensus', { 'known_params': [], 'ignore_fallback_authorities' : False, 'graph_logical_min' : 125, - 'graph_logical_max' : 25000 + 'graph_logical_max' : 25000, + 'clockskew_threshold': 0, }) def main(): @@ -58,6 +59,7 @@ def main(): consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() + clockskew = get_clockskew() # updates the download statistics file f = open(os.path.join(os.path.dirname(__file__), 'out', 'download-stats.csv'), 'a') @@ -299,6 +301,7 @@ def main(): w.set_consensuses(consensuses) w.set_votes(votes) w.set_fallback_dirs(fallback_dirs) + w.set_clockskew(clockskew) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), \ True, os.path.join(os.path.dirname(__file__), 'out', 'relay-indexes.txt')) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False)

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 20 Apr '18

20 Apr '18

commit 51078a0d3a00a16bab3d5b8723f814718919b4c9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 20 15:20:24 2018 +0000 Update translations for support-tbb --- it.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/it.json b/it.json index 249615c58..8758e7e08 100644 --- a/it.json +++ b/it.json @@ -111,7 +111,7 @@ "id": "#tbb-18", "control": "tbb-18", "title": "Esiste un supporto per *BSD?", - "description": "<p class=\"mb-3\">Sorry, but there is currently no official support for running Tor Browser on *BSD. There is something called the TorBSD project, but their Tor Browser is not officially supported.</p>" + "description": "<p class=\"mb-3\">Siamo spiacenti, ma, ad ora, non esiste un supporto ufficiale per eseguire Tor Browser su *BSD. Esiste il TorBSD project, ma non è ufficialmente supportato.</p>" }, "tbb-19": { "id": "#tbb-19", @@ -146,25 +146,25 @@ "tbb-24": { "id": "#tbb-24", "control": "tbb-24", - "title": "I'm having a problem with DuckDuckGo.", + "title": "Sto avendo un problema con DuckDuckGo.", "description": "<p class=\"mb-3\">Please see the <mark><a href=\"https://duck.co/help\">DuckDuckGo support portal</a></mark>. If you believe this is a Tor Browser issue, please report it on our <mark><a href=\"https://trac.torproject.org/\">bug tracker</a></mark>.</p>" }, "tbb-25": { "id": "#tbb-25", "control": "tbb-25", - "title": "I'm having a problem with NoScript.", + "title": "Sto avendo un problema con NoScript.", "description": "<p class=\"mb-3\">Please see the <mark><a href=\"https://noscript.net/faq\">NoScript FAQ</a></mark>. If you believe this is a Tor Browser issue, please report it on our <mark><a href=\"https://trac.torproject.org/\">bug tracker</a></mark>.</p>" }, "tbb-26": { "id": "#tbb-26", "control": "tbb-26", - "title": "I'm having a problem with HTTPS Everywhere.", + "title": "Sto avendo un problema con HTTPS Everywhere.", "description": "<p class=\"mb-3\">Please see the <mark><a href=\"https://www.eff.org/https-everywhere/faq\">HTTPS Everywhere</a></mark>. If you believe this is a Tor Browser issue, please report it on our <mark><a href=\"https://trac.torproject.org/\">bug tracker</a></mark>.</p>" }, "tbb-27": { "id": "#tbb-27", "control": "tbb-27", - "title": "How do I update Tor Browser?", + "title": "Come aggiorno Tor Browser?", "description": "<p class=\"mb-3\">You can update Tor Browser as soon as a new version is released.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Tor Browser will prompt you to update the software once a new version has been released.</h4><p class=\"card-text\">The Torbutton icon (the little green onion in the top left corner of the browser) will display a yellow triangle.</p></div></div></div><p class=\"mb-3\">You may see a written indication when Tor Browser opens telling you that an update is available.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div><p class=\"mb-3\">Tor browser will install the updates.</p><div class=\"col-md-6\"><div clas s=\"card\"><img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div>" }, "tbb-28": {

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 20 Apr '18

20 Apr '18

commit 0ac3d52ad338913e318ae3269d4e61ba05a364e8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 20 15:20:17 2018 +0000 Update translations for support-miscellaneous --- it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it.json b/it.json index 65749dcb9..928f62d0c 100644 --- a/it.json +++ b/it.json @@ -21,7 +21,7 @@ "id": "#misc-4", "control": "misc-4", "title": "Posso usare Tor con bittorrent?", - "description": "<p class=\"mb-3\">We do not recommend using Tor with bittorrent. For further details, please see our <mark><a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog post on the subject</a></mark>.</p>" + "description": "<p class=\"mb-3\">Non consigliamo di usare Tor con bittorrent. Per ulteriori dettagli, guarda il nostro <mark><a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog post in materia</a></mark>.</p>" }, "misc-5": { "id": "#misc-5",

1 0