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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 May '13

01 May '13

commit 05fc14b8eb050ce0de6eb3b23de11d7b5cf9c03b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 12:45:59 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 06f60d6..4fdf234 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,6 +1,6 @@ https-everywhere.menu.globalEnable = 启用 HTTPS Everywhere -https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere +https-everywhere.menu.globalDisable = 禁用 HTTPS Everywhere https-everywhere.menu.enableDisable = 启用/禁用规则 https-everywhere.menu.noRules = （本页面无规则） -https-everywhere.menu.unknownRules = （对此页面的规则未知） -https-everywhere.toolbar.hint = HTTPS Everywhere 现在已激活。根据每个网站，可点击地址栏中图标进行打开或关闭该功能。 +https-everywhere.menu.unknownRules = （此页面规则未知） +https-everywhere.toolbar.hint = HTTPS Everywhere 当前已激活。根据每个网站，可点击地址栏中图标启用或禁用该功能。

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 May '13

01 May '13

commit 76645f5989de790b1f28de3ff71e4024af57acfc Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 12:16:10 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- zh-CN/https-everywhere.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 68561e6..c474dda 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -30,7 +30,7 @@ <!ENTITY https-everywhere.prefs.reset_default "重置为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> -<!ENTITY https-everywhere.source.downloading "下载中"> +<!ENTITY https-everywhere.source.downloading "正在下载"> <!ENTITY https-everywhere.source.filename "文件名"> <!ENTITY https-everywhere.source.unable_to_download "无法下载源代码。"> diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 87bedd7..06f60d6 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere +https-everywhere.menu.globalEnable = 启用 HTTPS Everywhere https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere -https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = （对此页面没有规则） +https-everywhere.menu.enableDisable = 启用/禁用规则 +https-everywhere.menu.noRules = （本页面无规则） https-everywhere.menu.unknownRules = （对此页面的规则未知） https-everywhere.toolbar.hint = HTTPS Everywhere 现在已激活。根据每个网站，可点击地址栏中图标进行打开或关闭该功能。

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 May '13

01 May '13

commit 708304a7d399890deb88f5a8d8100fc5481a1fed Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 12:16:04 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- zh-CN/https-everywhere.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 68561e6..c474dda 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -30,7 +30,7 @@ <!ENTITY https-everywhere.prefs.reset_default "重置为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> -<!ENTITY https-everywhere.source.downloading "下载中"> +<!ENTITY https-everywhere.source.downloading "正在下载"> <!ENTITY https-everywhere.source.filename "文件名"> <!ENTITY https-everywhere.source.unable_to_download "无法下载源代码。"> diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 87bedd7..06f60d6 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere +https-everywhere.menu.globalEnable = 启用 HTTPS Everywhere https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere -https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = （对此页面没有规则） +https-everywhere.menu.enableDisable = 启用/禁用规则 +https-everywhere.menu.noRules = （本页面无规则） https-everywhere.menu.unknownRules = （对此页面的规则未知） https-everywhere.toolbar.hint = HTTPS Everywhere 现在已激活。根据每个网站，可点击地址栏中图标进行打开或关闭该功能。

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 May '13

01 May '13

commit bc01e7e767b1b8b665fb0bac6f551983cfa4835f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 11:46:05 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 02b56f5..68561e6 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -27,7 +27,7 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> -<!ENTITY https-everywhere.prefs.reset_default "重设为默认"> +<!ENTITY https-everywhere.prefs.reset_default "重置为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "下载中">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 May '13

01 May '13

commit 722802b67501e2655156af2e6098a5f674777dab Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 11:45:59 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 02b56f5..68561e6 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -27,7 +27,7 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> -<!ENTITY https-everywhere.prefs.reset_default "重设为默认"> +<!ENTITY https-everywhere.prefs.reset_default "重置为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "下载中">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 May '13

01 May '13

commit 60f1d2b3866956f0913b9aa3820b4546fc8ff9a8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 11:16:12 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 08adbec..02b56f5 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -25,7 +25,7 @@ <!ENTITY https-everywhere.prefs.list_caption "应启用哪些 HTTPS 重定向规则？"> <!ENTITY https-everywhere.prefs.enabled "已开启"> <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> -<!ENTITY https-everywhere.prefs.here_link "点击这里"> +<!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> <!ENTITY https-everywhere.prefs.reset_default "重设为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 May '13

01 May '13

commit f105f389dac68ea54999257b89da8ce9fe85b418 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 11:16:04 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 08adbec..02b56f5 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -25,7 +25,7 @@ <!ENTITY https-everywhere.prefs.list_caption "应启用哪些 HTTPS 重定向规则？"> <!ENTITY https-everywhere.prefs.enabled "已开启"> <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> -<!ENTITY https-everywhere.prefs.here_link "点击这里"> +<!ENTITY https-everywhere.prefs.here_link "这里"> <!ENTITY https-everywhere.prefs.toggle "切换"> <!ENTITY https-everywhere.prefs.reset_default "重设为默认"> <!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码">

1 0

[onionoo/master] Make writing summary file almost atomic using a temp file.
by karsten＠torproject.org 01 May '13

01 May '13

commit 0c84865391db75a294169174e04ca585824e3111 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 1 11:46:32 2013 +0200 Make writing summary file almost atomic using a temp file. --- src/org/torproject/onionoo/CurrentNodes.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 4319836..32d6576 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -174,8 +174,10 @@ public class CurrentNodes { boolean includeOldNodes) { try { summaryFile.getParentFile().mkdirs(); + File summaryTempFile = new File( + summaryFile.getAbsolutePath() + ".tmp"); BufferedWriter bw = new BufferedWriter(new FileWriter( - summaryFile)); + summaryTempFile)); SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); @@ -265,6 +267,8 @@ public class CurrentNodes { + "null\n"); } bw.close(); + summaryFile.delete(); + summaryTempFile.renameTo(summaryFile); } catch (IOException e) { System.err.println("Could not write '" + summaryFile.getAbsolutePath() + "' to disk. Exiting.");

1 0

[onionoo/master] Handle errors when parsing corrupt summary file.
by karsten＠torproject.org 01 May '13

01 May '13

commit 7a680363b44223aec32ba6a14440e10693d4cb6a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 1 11:31:04 2013 +0200 Handle errors when parsing corrupt summary file. --- src/org/torproject/onionoo/CurrentNodes.java | 221 ++++++++++++++------------ 1 files changed, 117 insertions(+), 104 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 80b76c5..4319836 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -44,118 +44,131 @@ public class CurrentNodes { BufferedReader br = new BufferedReader(new FileReader( summaryFile)); String line; - SimpleDateFormat dateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); while ((line = br.readLine()) != null) { - String[] parts = line.split(" "); - boolean isRelay = parts[0].equals("r"); - if (parts.length < 9) { - System.err.println("Line '" + line + "' in '" - + summaryFile.getAbsolutePath() - + "' is invalid. Exiting."); - System.exit(1); - } - String nickname = parts[1]; - String fingerprint = parts[2]; - String addresses = parts[3]; - String address; - SortedSet<String> orAddressesAndPorts = new TreeSet<String>(); - SortedSet<String> exitAddresses = new TreeSet<String>(); - if (addresses.contains(";")) { - String[] addressParts = addresses.split(";", -1); - if (addressParts.length != 3) { - System.err.println("Line '" + line + "' in '" - + summaryFile.getAbsolutePath() - + " is invalid. Exiting."); - System.exit(1); - } - address = addressParts[0]; - if (addressParts[1].length() > 0) { - orAddressesAndPorts.addAll(Arrays.asList( - addressParts[1].split("\\+"))); - } - if (addressParts[2].length() > 0) { - exitAddresses.addAll(Arrays.asList( - addressParts[2].split("\\+"))); - } - } else { - address = addresses; - } - long publishedOrValidAfterMillis = dateTimeFormat.parse( - parts[4] + " " + parts[5]).getTime(); - int orPort = Integer.parseInt(parts[6]); - int dirPort = Integer.parseInt(parts[7]); - SortedSet<String> relayFlags = new TreeSet<String>( - Arrays.asList(parts[8].split(","))); - long consensusWeight = -1L; - if (parts.length > 9) { - consensusWeight = Long.parseLong(parts[9]); - } - String countryCode = "??"; - if (parts.length > 10) { - countryCode = parts[10]; - } - String hostName = null; - long lastRdnsLookup = -1L; - if (parts.length > 12) { - hostName = parts[11].equals("null") ? null : parts[11]; - lastRdnsLookup = Long.parseLong(parts[12]); - } - String defaultPolicy = null, portList = null; - if (parts.length > 14) { - if (!parts[13].equals("null")) { - defaultPolicy = parts[13]; - } - if (!parts[14].equals("null")) { - portList = parts[14]; - } - } - long firstSeenMillis = publishedOrValidAfterMillis; - if (parts.length > 16) { - firstSeenMillis = dateTimeFormat.parse(parts[15] + " " - + parts[16]).getTime(); - } - long lastChangedAddresses = publishedOrValidAfterMillis; - if (parts.length > 18 && !parts[17].equals("null")) { - lastChangedAddresses = dateTimeFormat.parse(parts[17] + " " - + parts[18]).getTime(); - } - String aSNumber = null; - if (parts.length > 19) { - aSNumber = parts[19]; - } - if (isRelay) { - this.addRelay(nickname, fingerprint, address, - orAddressesAndPorts, exitAddresses, - publishedOrValidAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, countryCode, hostName, lastRdnsLookup, - defaultPolicy, portList, firstSeenMillis, - lastChangedAddresses, aSNumber); - } else { - this.addBridge(nickname, fingerprint, address, - orAddressesAndPorts, exitAddresses, - publishedOrValidAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, countryCode, hostName, lastRdnsLookup, - defaultPolicy, portList, firstSeenMillis, - lastChangedAddresses, aSNumber); - } + this.parseSummaryFileLine(line); } br.close(); } catch (IOException e) { - System.err.println("Could not read " - + summaryFile.getAbsolutePath() + ". Exiting."); - e.printStackTrace(); - System.exit(1); - } catch (ParseException e) { - System.err.println("Could not read " - + summaryFile.getAbsolutePath() + ". Exiting."); - e.printStackTrace(); - System.exit(1); + System.err.println("I/O error while reading " + + summaryFile.getAbsolutePath() + ": " + e.getMessage() + + ". Ignoring."); } } } + private void parseSummaryFileLine(String line) { + boolean isRelay; + String nickname, fingerprint, address, countryCode = "??", + hostName = null, defaultPolicy = null, portList = null, + aSNumber = null; + SortedSet<String> orAddressesAndPorts, exitAddresses, relayFlags; + long publishedOrValidAfterMillis, consensusWeight = -1L, + lastRdnsLookup = -1L, firstSeenMillis, lastChangedAddresses; + int orPort, dirPort; + try { + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String[] parts = line.split(" "); + isRelay = parts[0].equals("r"); + if (parts.length < 9) { + System.err.println("Too few space-separated values in line '" + + line + "'. Skipping."); + return; + } + nickname = parts[1]; + fingerprint = parts[2]; + String addresses = parts[3]; + orAddressesAndPorts = new TreeSet<String>(); + exitAddresses = new TreeSet<String>(); + if (addresses.contains(";")) { + String[] addressParts = addresses.split(";", -1); + if (addressParts.length != 3) { + System.err.println("Invalid addresses entry in line '" + line + + "'. Skipping."); + return; + } + address = addressParts[0]; + if (addressParts[1].length() > 0) { + orAddressesAndPorts.addAll(Arrays.asList( + addressParts[1].split("\\+"))); + } + if (addressParts[2].length() > 0) { + exitAddresses.addAll(Arrays.asList( + addressParts[2].split("\\+"))); + } + } else { + address = addresses; + } + publishedOrValidAfterMillis = dateTimeFormat.parse( + parts[4] + " " + parts[5]).getTime(); + orPort = Integer.parseInt(parts[6]); + dirPort = Integer.parseInt(parts[7]); + relayFlags = new TreeSet<String>( + Arrays.asList(parts[8].split(","))); + if (parts.length > 9) { + consensusWeight = Long.parseLong(parts[9]); + } + if (parts.length > 10) { + countryCode = parts[10]; + } + if (parts.length > 12) { + hostName = parts[11].equals("null") ? null : parts[11]; + lastRdnsLookup = Long.parseLong(parts[12]); + } + if (parts.length > 14) { + if (!parts[13].equals("null")) { + defaultPolicy = parts[13]; + } + if (!parts[14].equals("null")) { + portList = parts[14]; + } + } + firstSeenMillis = publishedOrValidAfterMillis; + if (parts.length > 16) { + firstSeenMillis = dateTimeFormat.parse(parts[15] + " " + + parts[16]).getTime(); + } + lastChangedAddresses = publishedOrValidAfterMillis; + if (parts.length > 18 && !parts[17].equals("null")) { + lastChangedAddresses = dateTimeFormat.parse(parts[17] + " " + + parts[18]).getTime(); + } + if (parts.length > 19) { + aSNumber = parts[19]; + } + } catch (NumberFormatException e) { + System.err.println("Number format exception while parsing line '" + + line + "': " + e.getMessage() + ". Skipping."); + return; + } catch (ParseException e) { + System.err.println("Parse exception while parsing line '" + line + + "': " + e.getMessage() + ". Skipping."); + return; + } catch (Exception e) { + /* This catch block is only here to handle yet unknown errors. It + * should go away once we're sure what kind of errors can occur. */ + System.err.println("Unknown exception while parsing line '" + line + + "': " + e.getMessage() + ". Skipping."); + return; + } + if (isRelay) { + this.addRelay(nickname, fingerprint, address, + orAddressesAndPorts, exitAddresses, + publishedOrValidAfterMillis, orPort, dirPort, relayFlags, + consensusWeight, countryCode, hostName, lastRdnsLookup, + defaultPolicy, portList, firstSeenMillis, + lastChangedAddresses, aSNumber); + } else { + this.addBridge(nickname, fingerprint, address, + orAddressesAndPorts, exitAddresses, + publishedOrValidAfterMillis, orPort, dirPort, relayFlags, + consensusWeight, countryCode, hostName, lastRdnsLookup, + defaultPolicy, portList, firstSeenMillis, + lastChangedAddresses, aSNumber); + } + } + /* Write the internal relay search data file to disk. */ public void writeRelaySearchDataFile(File summaryFile, boolean includeOldNodes) {

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 May '13

01 May '13

commit f2f21d439f889592fd28201e7281f27ee18b8bff Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 1 07:46:06 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 2d37aa8..08adbec 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -21,8 +21,8 @@ <!ENTITY https-everywhere.prefs.reset_defaults "重设为默认"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点"> -<!ENTITY https-everywhere.prefs.notes "附注"> -<!ENTITY https-everywhere.prefs.list_caption "应该启用哪些 HTTPS 重定向规则？"> +<!ENTITY https-everywhere.prefs.notes "注释"> +<!ENTITY https-everywhere.prefs.list_caption "应启用哪些 HTTPS 重定向规则？"> <!ENTITY https-everywhere.prefs.enabled "已开启"> <!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "点击这里">

1 0