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

[metrics-lib/master] Restrict valid keyword characters to [A-Za-z0-9-]+.
by karsten＠torproject.org 03 May '13

03 May '13

commit e7f93e1a6a0a761d4d02295daf622f9e446dcd93 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 3 15:32:13 2013 +0200 Restrict valid keyword characters to [A-Za-z0-9-]+. Fixes #8798. --- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 1 + .../torproject/descriptor/impl/ParseHelper.java | 11 ++++++ .../descriptor/impl/ServerDescriptorImpl.java | 1 + .../impl/ExtraInfoDescriptorImplTest.java | 34 ++++++++++++++++++ .../descriptor/impl/ServerDescriptorImplTest.java | 37 ++++++++++++++++++++ 5 files changed, 84 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 9bd9a9b..f5bf8ed 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -183,6 +183,7 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl } else if (line.startsWith("-----END")) { skipCrypto = false; } else if (!skipCrypto) { + ParseHelper.parseKeyword(line, partsNoOpt[0]); if (this.failUnrecognizedDescriptorLines) { throw new DescriptorParseException("Unrecognized line '" + line + "' in extra-info descriptor."); diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 1b7eff2..4fd776e 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -17,6 +17,17 @@ import org.apache.commons.codec.binary.Hex; public class ParseHelper { + private static Pattern keywordPattern = + Pattern.compile("^[A-Za-z0-9-]+$"); + public static String parseKeyword(String line, String keyword) + throws DescriptorParseException { + if (!keywordPattern.matcher(keyword).matches()) { + throw new DescriptorParseException("Unrecognized character in " + + "keyword '" + keyword + "' in line '" + line + "'."); + } + return keyword; + } + private static Pattern ipv4Pattern = Pattern.compile("^[0-9\\.]{7,15}$"); public static String parseIpv4Address(String line, String address) diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 1fb39f5..baf4456 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -152,6 +152,7 @@ public class ServerDescriptorImpl extends DescriptorImpl } else if (crypto != null) { crypto.append(line + "\n"); } else { + ParseHelper.parseKeyword(line, partsNoOpt[0]); if (this.failUnrecognizedDescriptorLines) { throw new DescriptorParseException("Unrecognized line '" + line + "' in server descriptor."); diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 569ce06..11b07b2 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -7,6 +7,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -142,6 +144,15 @@ public class ExtraInfoDescriptorImplTest { return new ExtraInfoDescriptorImpl(db.buildDescriptor(), failUnrecognizedDescriptorLines); } + private byte[] nonAsciiLineBytes = null; + private static ExtraInfoDescriptor createWithNonAsciiLineBytes( + byte[] lineBytes, boolean failUnrecognizedDescriptorLines) + throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.nonAsciiLineBytes = lineBytes; + return new ExtraInfoDescriptorImpl(db.buildDescriptor(), + failUnrecognizedDescriptorLines); + } private String routerSignatureLines = "router-signature\n" + "-----BEGIN SIGNATURE-----\n" + "o4j+kH8UQfjBwepUnr99v0ebN8RpzHJ/lqYsTojXHy9kMr1RNI9IDeSzA7PSqT" @@ -204,6 +215,20 @@ public class ExtraInfoDescriptorImplTest { if (this.unrecognizedLine != null) { sb.append(this.unrecognizedLine + "\n"); } + if (this.nonAsciiLineBytes != null) { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + baos.write(sb.toString().getBytes()); + baos.write(this.nonAsciiLineBytes); + baos.write("\n".getBytes()); + if (this.routerSignatureLines != null) { + baos.write(this.routerSignatureLines.getBytes()); + } + return baos.toByteArray(); + } catch (IOException e) { + return null; + } + } if (this.routerSignatureLines != null) { sb.append(this.routerSignatureLines + "\n"); } @@ -1304,6 +1329,15 @@ public class ExtraInfoDescriptorImplTest { } @Test(expected = DescriptorParseException.class) + public void testBridgeIpsNonAsciiKeyword() + throws DescriptorParseException { + DescriptorBuilder.createWithNonAsciiLineBytes(new byte[] { + 0x14, (byte) 0xfe, 0x18, // non-ascii chars + 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2d, // "bridge-" + 0x69, 0x70, 0x73 }, false); // "ips" (no newline) + } + + @Test(expected = DescriptorParseException.class) public void testBridgeIpVersionsDouble() throws DescriptorParseException { BridgeStatsBuilder.createWithBridgeIpVersionsLine( diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 5bd73af..9eb38ae 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -8,6 +8,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -216,6 +218,15 @@ public class ServerDescriptorImplTest { return new ServerDescriptorImpl(db.buildDescriptor(), failUnrecognizedDescriptorLines); } + private byte[] nonAsciiLineBytes = null; + private static ServerDescriptor createWithNonAsciiLineBytes( + byte[] lineBytes, boolean failUnrecognizedDescriptorLines) + throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.nonAsciiLineBytes = lineBytes; + return new ServerDescriptorImpl(db.buildDescriptor(), + failUnrecognizedDescriptorLines); + } private byte[] buildDescriptor() { StringBuilder sb = new StringBuilder(); if (this.routerLine != null) { @@ -287,6 +298,20 @@ public class ServerDescriptorImplTest { if (this.unrecognizedLine != null) { sb.append(this.unrecognizedLine + "\n"); } + if (this.nonAsciiLineBytes != null) { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + baos.write(sb.toString().getBytes()); + baos.write(this.nonAsciiLineBytes); + baos.write("\n".getBytes()); + if (this.routerSignatureLines != null) { + baos.write(this.routerSignatureLines.getBytes()); + } + return baos.toByteArray(); + } catch (IOException e) { + return null; + } + } if (this.routerSignatureLines != null) { sb.append(this.routerSignatureLines + "\n"); } @@ -1159,6 +1184,18 @@ public class ServerDescriptorImplTest { "allow-single-hop-exits true"); } + @Test(expected = DescriptorParseException.class) + public void testAllowSingleHopExitsNonAsciiKeyword() + throws DescriptorParseException { + DescriptorBuilder.createWithNonAsciiLineBytes(new byte[] { + 0x14, (byte) 0xfe, 0x18, // non-ascii chars + 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x2d, // "allow-" + 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x2d, // "single-" + 0x68, 0x6f, 0x70, 0x2d, // "hop-" + 0x65, 0x78, 0x69, 0x74, 0x73 }, // "exits" (no newline) + false); + } + @Test() public void testIpv6PolicyLine() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder.

1 0

[tor-launcher/master] Windows clipboard: Use \r\n for end of line.
by brade＠torproject.org 03 May '13

03 May '13

commit cac0e0880c807ce8d45fcbd7d6e91c5c3d0d1a22 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 3 09:07:03 2013 -0400 Windows clipboard: Use \r\n for end of line. --- src/components/tl-protocol.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 2ff5ab7..c4e14f9 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -423,6 +423,7 @@ TorProtocolService.prototype = .getService(Ci.nsIScriptableDateFormat); let dateFormat = dateFmtSvc.dateFormatShort; let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; + let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; for (let i = 0; i < this.mTorLog.length; ++i) { let logObj = this.mTorLog[i]; @@ -438,7 +439,7 @@ TorProtocolService.prototype = fracSecsStr += "0"; timeStr += '.' + fracSecsStr; - s += timeStr + " [" + logObj.type + "] " + logObj.msg + "\n"; + s += timeStr + " [" + logObj.type + "] " + logObj.msg + eol; } }

1 0

[tor-launcher/master] Move back to the correct wizard panel upon error.
by brade＠torproject.org 03 May '13

03 May '13

commit 54c15a465f67f47c4cd867986328342289c0cbef Author: Kathy Brade <brade(a)torproject.org> Date: Thu May 2 23:06:40 2013 -0400 Move back to the correct wizard panel upon error. --- src/chrome/content/network-settings.js | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 839d3d2..b3f4fb0 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -389,8 +389,8 @@ function onProxyTypeChange() { var proxyType = getElemValue(kProxyTypeMenulist, null); var mayHaveCredentials = (proxyType != "SOCKS4"); - enableTextBox(kProxyUsername, mayHaveCredentials); - enableTextBox(kProxyPassword, mayHaveCredentials); + enableTextBox(kProxyUsername, mayHaveCredentials); + enableTextBox(kProxyPassword, mayHaveCredentials); } @@ -619,7 +619,7 @@ function applySettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = "0"; - this.setConfAndReportErrors(settings); + this.setConfAndReportErrors(settings, null); gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); @@ -660,7 +660,7 @@ function applyProxySettings() if (!settings) return false; - return this.setConfAndReportErrors(settings); + return this.setConfAndReportErrors(settings, "proxyYES"); } @@ -739,7 +739,7 @@ function applyFirewallSettings() if (!settings) return false; - return this.setConfAndReportErrors(settings); + return this.setConfAndReportErrors(settings, "firewallYES"); } @@ -786,7 +786,7 @@ function applyBridgeSettings() if (!settings) return false; - return this.setConfAndReportErrors(settings); + return this.setConfAndReportErrors(settings, "bridges"); } @@ -856,7 +856,7 @@ function parseAndValidateBridges(aStr) // Returns true if successful. -function setConfAndReportErrors(aSettingsObj) +function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) { var reply = gProtocolSvc.TorSetConf(aSettingsObj); var didSucceed = gProtocolSvc.TorCommandSucceeded(reply); @@ -873,6 +873,23 @@ function setConfAndReportErrors(aSettingsObj) } } + if (aShowOnErrorPanelID) + { + var wizardElem = getWizard(); + if (wizardElem) try + { + const kMaxTries = 10; + for (var count = 0; + ((count < kMaxTries) && + (wizardElem.currentPage.pageid != aShowOnErrorPanelID) && + wizardElem.canRewind); + ++count) + { + wizardElem.rewind(); + } + } catch (e) {} + } + showSaveSettingsAlert(details); }

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 02 May '13

02 May '13

commit c32fa937e90af4baf1c419afcd9dad561ed35603 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 2 22:16:27 2013 +0000 Update translations for mat-gui_completed --- es.po | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/es.po b/es.po index 052217f..1620b6c 100644 --- a/es.po +++ b/es.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Envite <envite(a)rolamasao.org>, 2013 # strel <strelnic(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-04-26 13:18+0000\n" -"Last-Translator: strel <strelnic(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-02 21:52+0000\n" +"Last-Translator: Envite <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "Añadir" #: mat-gui:109 mat-gui:183 msgid "Add files" -msgstr "Añade archivos" +msgstr "Añade ficheros" #: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 #: mat-gui:573 mat-gui:575 @@ -37,7 +38,7 @@ msgstr "Limpiar" #: mat-gui:115 msgid "Clean selected files" -msgstr "Limpia archivos seleccionados" +msgstr "Limpia ficheros seleccionados" #: mat-gui:119 mat-gui:214 msgid "Check" @@ -45,7 +46,7 @@ msgstr "Verificar" #: mat-gui:121 msgid "Check selected files for harmful meta" -msgstr "Verifica si los archivos seleccionados contienen metadatos dañinos" +msgstr "Verifica si los ficheros seleccionados contienen metadatos dañinos" #: mat-gui:125 mat-gui:185 msgid "Quit" @@ -57,7 +58,7 @@ msgstr "Ruta" #: mat-gui:137 mat-gui:363 msgid "Filename" -msgstr "Nombre de archivo" +msgstr "Nombre de fichero" #: mat-gui:137 mat-gui:365 msgid "Mimetype" @@ -69,11 +70,11 @@ msgstr "Estado" #: mat-gui:138 msgid "Cleaned file" -msgstr "Archivo limpiado" +msgstr "Fichero limpiado" #: mat-gui:182 msgid "Files" -msgstr "Archivos" +msgstr "Ficheros" #: mat-gui:188 msgid "Edit" @@ -81,7 +82,7 @@ msgstr "Editar" #: mat-gui:189 msgid "Clear the filelist" -msgstr "Borrar la lista de archivos" +msgstr "Borrar la lista de ficheros" #: mat-gui:192 mat-gui:447 msgid "Preferences" @@ -105,15 +106,15 @@ msgstr "Acerca de" #: mat-gui:241 msgid "Choose files" -msgstr "Elegir archivos" +msgstr "Elegir ficheros" #: mat-gui:248 msgid "All files" -msgstr "Todos los archivos" +msgstr "Todos los ficheros" #: mat-gui:255 msgid "Supported files" -msgstr "Archivos soportados" +msgstr "Ficheros soportados" #: mat-gui:297 msgid "unknow" @@ -129,7 +130,7 @@ msgstr "No soportado" #: mat-gui:381 msgid "This software was coded during the GSoC 2011" -msgstr "Este software se codificó durante el GSoC 2011" +msgstr "Este programa se creó durante el GSoC ('Google Summer of Code') 2011" #: mat-gui:386 msgid "Website" @@ -141,11 +142,11 @@ msgstr "Forzar limpieza" #: mat-gui:464 msgid "Do not check if already clean before cleaning" -msgstr "No verifica si ya estaba limpio antes de limpiar" +msgstr "No verificar si ya estaba limpio antes de limpiar" #: mat-gui:468 msgid "Backup" -msgstr "Copia de respaldo" +msgstr "Copia de respaldo ('backup')" #: mat-gui:471 msgid "Keep a backup copy" @@ -161,11 +162,11 @@ msgstr "Reduce el tamaño y calidad del PDF producido" #: mat-gui:480 msgid "Add unsupported file to archives" -msgstr "Añadir archivo no soportado a los archivos" +msgstr "Añadir fichero no soportado a los archivos" #: mat-gui:484 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Añade archivo no soportado (y no anonimizado) a los archivos de salida" +msgstr "Añade fichero no soportado (y no anonimizado) al archivo de salida" #: mat-gui:554 #, python-format

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 02 May '13

02 May '13

commit 53ea33db18adfd720f4cf555303862bc2ccbd219 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 2 22:16:24 2013 +0000 Update translations for mat-gui --- es.po | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/es.po b/es.po index 052217f..1620b6c 100644 --- a/es.po +++ b/es.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Envite <envite(a)rolamasao.org>, 2013 # strel <strelnic(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-04-26 13:18+0000\n" -"Last-Translator: strel <strelnic(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-02 21:52+0000\n" +"Last-Translator: Envite <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "Añadir" #: mat-gui:109 mat-gui:183 msgid "Add files" -msgstr "Añade archivos" +msgstr "Añade ficheros" #: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 #: mat-gui:573 mat-gui:575 @@ -37,7 +38,7 @@ msgstr "Limpiar" #: mat-gui:115 msgid "Clean selected files" -msgstr "Limpia archivos seleccionados" +msgstr "Limpia ficheros seleccionados" #: mat-gui:119 mat-gui:214 msgid "Check" @@ -45,7 +46,7 @@ msgstr "Verificar" #: mat-gui:121 msgid "Check selected files for harmful meta" -msgstr "Verifica si los archivos seleccionados contienen metadatos dañinos" +msgstr "Verifica si los ficheros seleccionados contienen metadatos dañinos" #: mat-gui:125 mat-gui:185 msgid "Quit" @@ -57,7 +58,7 @@ msgstr "Ruta" #: mat-gui:137 mat-gui:363 msgid "Filename" -msgstr "Nombre de archivo" +msgstr "Nombre de fichero" #: mat-gui:137 mat-gui:365 msgid "Mimetype" @@ -69,11 +70,11 @@ msgstr "Estado" #: mat-gui:138 msgid "Cleaned file" -msgstr "Archivo limpiado" +msgstr "Fichero limpiado" #: mat-gui:182 msgid "Files" -msgstr "Archivos" +msgstr "Ficheros" #: mat-gui:188 msgid "Edit" @@ -81,7 +82,7 @@ msgstr "Editar" #: mat-gui:189 msgid "Clear the filelist" -msgstr "Borrar la lista de archivos" +msgstr "Borrar la lista de ficheros" #: mat-gui:192 mat-gui:447 msgid "Preferences" @@ -105,15 +106,15 @@ msgstr "Acerca de" #: mat-gui:241 msgid "Choose files" -msgstr "Elegir archivos" +msgstr "Elegir ficheros" #: mat-gui:248 msgid "All files" -msgstr "Todos los archivos" +msgstr "Todos los ficheros" #: mat-gui:255 msgid "Supported files" -msgstr "Archivos soportados" +msgstr "Ficheros soportados" #: mat-gui:297 msgid "unknow" @@ -129,7 +130,7 @@ msgstr "No soportado" #: mat-gui:381 msgid "This software was coded during the GSoC 2011" -msgstr "Este software se codificó durante el GSoC 2011" +msgstr "Este programa se creó durante el GSoC ('Google Summer of Code') 2011" #: mat-gui:386 msgid "Website" @@ -141,11 +142,11 @@ msgstr "Forzar limpieza" #: mat-gui:464 msgid "Do not check if already clean before cleaning" -msgstr "No verifica si ya estaba limpio antes de limpiar" +msgstr "No verificar si ya estaba limpio antes de limpiar" #: mat-gui:468 msgid "Backup" -msgstr "Copia de respaldo" +msgstr "Copia de respaldo ('backup')" #: mat-gui:471 msgid "Keep a backup copy" @@ -161,11 +162,11 @@ msgstr "Reduce el tamaño y calidad del PDF producido" #: mat-gui:480 msgid "Add unsupported file to archives" -msgstr "Añadir archivo no soportado a los archivos" +msgstr "Añadir fichero no soportado a los archivos" #: mat-gui:484 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Añade archivo no soportado (y no anonimizado) a los archivos de salida" +msgstr "Añade fichero no soportado (y no anonimizado) al archivo de salida" #: mat-gui:554 #, python-format

1 0

[tor-launcher/master] Increase width of network settings dialog
by brade＠torproject.org 02 May '13

02 May '13

commit 8bd04bd0ecf2dac2b9e24adcfaeb88c2098b2cfc Author: Kathy Brade <brade(a)torproject.org> Date: Thu May 2 16:33:02 2013 -0400 Increase width of network settings dialog (to avoid text wrapping on Linux). --- src/chrome/skin/network-settings.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9fcfc96..f45bd04 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -6,7 +6,7 @@ */ dialog { - width: 520px; + width: 545px; height: 464px; font: -moz-dialog; }

1 0

[metrics-tasks/master] Fix edge case where we'd corrupt our merged table (#8462).
by karsten＠torproject.org 02 May '13

02 May '13

commit c09aa4ee5c8a1bc454d69b899f1dd113138f2446 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 2 21:29:17 2013 +0200 Fix edge case where we'd corrupt our merged table (#8462). --- task-8462/init-userstats.sql | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/task-8462/init-userstats.sql b/task-8462/init-userstats.sql index c586285..7c5df3d 100644 --- a/task-8462/init-userstats.sql +++ b/task-8462/init-userstats.sql @@ -388,6 +388,8 @@ BEGIN last_start := cur.merged_start; last_end := cur.merged_end; last_val := cur.merged_val; + undo_end := NULL; + undo_val := NULL; END IF; END LOOP;

1 0

[tor-launcher/master] Wizard improvements for Linux.
by brade＠torproject.org 02 May '13

02 May '13

commit 36dc70aeebe2017c184957d4e409a68ed14e3f53 Author: Kathy Brade <brade(a)torproject.org> Date: Thu May 2 15:00:18 2013 -0400 Wizard improvements for Linux. Fix problem where Back button was shown on bridges help panel. Avoid vertical scrollbar within bridges help panel. --- src/chrome/content/network-settings.js | 4 ++-- src/chrome/skin/network-settings.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index b2c94a4..839d3d2 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -432,6 +432,8 @@ function onOpenHelp() else gRestoreAfterHelpPanelID = getWizard().currentPage.pageid; + showPanel("bridgeHelp"); + if (getWizard()) { showOrHideButton("cancel", false, false); @@ -441,8 +443,6 @@ function onOpenHelp() } else overrideButtonLabel("cancel", "done"); - - showPanel("bridgeHelp"); } diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 436396a..9fcfc96 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -13,7 +13,7 @@ dialog { wizard { width: 540px; - height: 380px; + height: 400px; font: -moz-dialog; padding-top: 0px; }

1 0

[tor-launcher/master] Improved prompts and help text.
by brade＠torproject.org 02 May '13

02 May '13

commit 05146e20e4d32baeea3194ead38d0e20d43ad759 Author: Kathy Brade <brade(a)torproject.org> Date: Thu May 2 14:31:29 2013 -0400 Improved prompts and help text. --- src/chrome/content/network-settings-overlay.xul | 3 ++- src/chrome/locale/en/network-settings.dtd | 14 ++++++++------ src/chrome/skin/network-settings.css | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 05479d0..a062d8f 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -79,7 +79,8 @@ <button dlgtype="help" oncommand="onOpenHelp()" /> <label value="&torsettings.useBridges.label;" control="bridgeList"/> </hbox> - <textbox id="bridgeList" multiline="true" rows="3" /> + <textbox id="bridgeList" multiline="true" rows="3" + placeholder="&torsettings.useBridges.placeholder;" /> </vbox>  -<!ENTITY torSettings.proxyHelp "TODO Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ullamcorper dolor eget purus imperdiet quis ultrices massa tempor. Sed mattis tincidunt justo nec vehicula. Praesent fermentum quam vel neque congue imperdiet. Nam tincidunt sollicitudin neque, eu sodales quam eleifend at. Suspendisse potenti."> +<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether you are using a proxy."> <!ENTITY torSettings.enterProxy "Enter your proxy settings."> <!ENTITY torSettings.firewallQuestion "Does your Internet connection go through a firewall that only allows you to connect to certain ports?"> -<!ENTITY torSettings.firewallHelp "TODO Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ullamcorper dolor eget purus imperdiet quis ultrices massa tempor. Sed mattis tincidunt justo nec vehicula. Praesent fermentum quam vel neque congue imperdiet. Nam tincidunt sollicitudin neque, eu sodales quam eleifend at. Suspendisse potenti."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports allowed by your firewall."> -<!ENTITY torSettings.bridgeQuestion "If your ISP (Internet Service Provider) blocks connections to the Tor network, you will need to use bridge relays."> +<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems, change this setting."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by your firewall."> +<!ENTITY torSettings.bridgeQuestion "If your Internet Service Provider (ISP) blocks connections to the Tor network, you will need to use bridge relays.">  @@ -34,11 +34,13 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "My firewall only lets me connect to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My ISP blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays in the form address:port."> +<!ENTITY torsettings.useBridges.placeholder "address:port"> + <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridge relays (or 'bridges' for short) are Tor relays that aren't listed in the main directory. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays they probably won't be able to block all the bridges."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) is blocking Tor. Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message. However, so we can make it harder for an attacker to learn lots of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index a7064eb..436396a 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -13,7 +13,7 @@ dialog { wizard { width: 540px; - height: 410px; + height: 380px; font: -moz-dialog; padding-top: 0px; }

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 02 May '13

02 May '13

commit 89ed2ff156e8842a5c81bc12c03b0b7d48716a4e Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 2 17:46:17 2013 +0000 Update translations for liveusb-creator_completed --- ar/ar.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index adb3827..8f736ae 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-05-02 17:01+0000\n" +"PO-Revision-Date: 2013-05-02 17:34+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgstr "اخلق محور يو اس بي حي" #: ../liveusb/creator.py:429 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "يتم إنشاء مكان تخزين دائم بحجم %s ميغا بايت" +msgstr "يتم إنشاء مكان تخزين دائم بحجم %s ميجابايت" #: ../liveusb/gui.py:534 msgid "" @@ -175,7 +175,7 @@ msgstr "خطأ: لا يمكن ضبط العنوان أو الحصول على ر msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "خطأ: إن الـ SHA1 لقرص التشغيل التلقائي غير صالح. تستطيع تشغيل هذا البرنامج باستخدام المعطى --noverify لتجاوز فحص التحقق." +msgstr "خطأ: إن الـSHA1 للقرص الحي غير صحيح. تستطيع تشغيل هذا البرنامج باستخدام المعطى --noverify لتجاوز الفحص." #: ../liveusb/creator.py:144 msgid "Extracting live image to USB device..." @@ -439,7 +439,7 @@ msgstr "لا يمكن الكتابة على الجهاز %(device)s، سيتم #: ../liveusb/creator.py:411 msgid "Unknown ISO, skipping checksum verification" -msgstr "ملف ISO غير معروف، سيتم تجاوز التحقق من مجموع التأكد (checksum)." +msgstr "ملف ISO غير معروف، سيتم تجاوز الفحص." #: ../liveusb/creator.py:808 #, python-format @@ -497,7 +497,7 @@ msgstr "التحقق من الـSHA1 لملف القرص الحي..." #: ../liveusb/creator.py:389 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "التحقق من المجموع SHA256 لصورة القرص الحي..." +msgstr "التحقق من الـSHA256 لملف القرص الحي..." #: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 msgid "Verifying filesystem..."

1 0