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

[metrics-web/master] Change an Ant target name.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit 79c24bbe373272575ba313d7354c24c294602e5d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:43:35 2012 +0100 Change an Ant target name. --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index e148a13..8f57532 100644 --- a/build.xml +++ b/build.xml @@ -81,7 +81,7 @@ </target>  - <target name="make-war" + <target name="war" depends="compile"> <war destfile="${warfile}" webxml="${webxmlfile}">

1 0

[metrics-db/master] Move compiled Java classes from bin/ to classes/.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit fe5e7a0702953b4eaaa5e25de8052aac02ab09ca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:31:04 2012 +0100 Move compiled Java classes from bin/ to classes/. --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index 3f187be..b0ce368 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ <project default="run" name="ERNIE" basedir="."> <property name="sources" value="src/"/> - <property name="classes" value="bin/"/> + <property name="classes" value="classes/"/> <property name="tests" value="test"/> <property name="docs" value="javadoc/"/> <property name="name" value="ERNIE"/>

1 0

[metrics-db/master] Include exit lists in rsync, too.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit c7d8ec8a32ecfb24ef85745849e889f08947ddd1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 11:28:32 2012 +0100 Include exit lists in rsync, too. --- src/org/torproject/ernie/db/Main.java | 1 + src/org/torproject/ernie/db/RsyncDataProvider.java | 22 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index a20748a..ab79174 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -146,6 +146,7 @@ public class Main { new File(config.getSanitizedBridgesWriteDirectory()), config.getSanitizedAssignmentsDirectory() == null ? null : new File(config.getSanitizedAssignmentsDirectory()), + config.getDownloadExitList(), new File(config.getRsyncDirectory())); } diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 11aa1c0..2f2c1b4 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -13,7 +13,8 @@ import java.util.logging.*; public class RsyncDataProvider { public RsyncDataProvider(File directoryArchivesOutputDirectory, File sanitizedBridgesWriteDirectory, - File sanitizedAssignmentsDirectory, File rsyncDirectory) { + File sanitizedAssignmentsDirectory, + boolean downloadExitList, File rsyncDirectory) { /* Initialize logger. */ Logger logger = Logger.getLogger(RsyncDataProvider.class.getName()); @@ -126,6 +127,25 @@ public class RsyncDataProvider { + "are still " + fileNamesInRsync.size() + " files left in " + rsyncDirectory.getAbsolutePath() + "."); + /* Copy exit lists from the last 3 days. */ + if (downloadExitList) { + files.add(new File("exitlist")); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (pop.lastModified() >= cutOffMillis) { + String fileName = pop.getName(); + this.copyFile(pop, new File(rsyncDirectory, + "exit-lists/" + fileName)); + fileNamesInRsync.remove(pop.getName()); + } + } + } + logger.info("After copying exit lists, there are still " + + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); + /* Delete all files that we didn't (over-)write in this run. */ files.add(rsyncDirectory); while (!files.isEmpty()) {

1 0

[doctor/master] Warning every 6 hours about consensus params is enough.
by karsten＠torproject.org 27 Jan '12

27 Jan '12

commit 55233628d9b62bfae8a1fff64750904149c7dbcb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 27 08:09:40 2012 +0100 Warning every 6 hours about consensus params is enough. --- src/org/torproject/doctor/StatusFileReport.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 040a687..b103b4a 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -121,7 +121,7 @@ public class StatusFileReport { case ConflictingOrInvalidConsensusParams: warningStrings.put("NOTICE: The following directory " + "authorities set conflicting or invalid consensus " - + "parameters: " + detailsString, 150L * 60L * 1000L); + + "parameters: " + detailsString, 330L * 60L * 1000L); break; case CertificateExpiresInThreeMonths: warningStrings.put("NOTICE: The certificates of the following "

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Jan '12

27 Jan '12

commit b47a663cd162249d7e91451a7bc93eefb49d265b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 27 06:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 3efcc70..e9dc897 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 22:41+0000\n" +"PO-Revision-Date: 2012-01-27 06:43+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1812,43 +1812,43 @@ msgstr "ناشناخته" msgctxt "MainWindow" msgid "Tor is not running" -msgstr "تُر درحال اجرا نمی باشد" +msgstr "تور درحال اجرا نمی‌باشد" msgctxt "MainWindow" msgid "Tor is shutting down" -msgstr "تُر درحال بسته شدن میباشد" +msgstr "تور درحال بسته شدن است" msgctxt "MainWindow" msgid "Stop Tor Now" -msgstr "متوقف کردن تُر حالا" +msgstr "همین حالا تور را متوقف کن" msgctxt "MainWindow" msgid "Stop Tor" -msgstr "متوقف کردن تُر" +msgstr "تور را متوقف کن" msgctxt "MainWindow" msgid "Starting the Tor software" -msgstr "راه اندازی نرم افزار تُر" +msgstr "راه اندازی نرم افزار تور" msgctxt "MainWindow" msgid "Starting Tor" -msgstr "راه اندازی تُر" +msgstr "راه اندازی تور" msgctxt "MainWindow" msgid "Error Starting Tor" -msgstr "خطا در راه‌اندازی تُر" +msgstr "خطا در راه‌اندازی تور" msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." msgstr "" -"ویدالیا نتوانست تُر را راه‌اندازی کند. تنظیمات خود را دوباره بررسی کنید تا " -"مطمئن شوید مسیر فایل اجرایی تر را درست مشخص کرده‌اید." +"ویدالیا نتوانست تور را راه‌اندازی کند. تنظیمات خود را دوباره بررسی کنید تا " +"مطمین شوید مسیر فایل اجرایی تر را درست مشخص کرده‌اید." msgctxt "MainWindow" msgid "Connecting to Tor" -msgstr "اتصال به تُر" +msgstr "اتصال به تور" msgctxt "MainWindow" msgid "Connection Error" @@ -1864,7 +1864,7 @@ msgstr "خطا بسته شدن" msgctxt "MainWindow" msgid "Vidalia was unable to stop the Tor software." -msgstr "ویدالیا نتوانست نرم افزار تُر را متوقف کند." +msgstr "ویدالیا نتوانست نرم افزار تور را متوقف کند." msgctxt "MainWindow" msgid "Unexpected Error" @@ -1872,11 +1872,11 @@ msgstr "خطای غیرمنتظره" msgctxt "MainWindow" msgid "Authenticating to Tor" -msgstr "احرازهویت در تُر" +msgstr "احرازهویت در تور" msgctxt "MainWindow" msgid "Cookie Authentication Required" -msgstr "نیاز به کوکی احراز هویت" +msgstr "احراز هویت کوکی موردنیاز است" msgctxt "MainWindow" msgid ""

1 0

r25353: {} bastards are still bastards in real name environments. (projects/presentations/images)
by Andrew Lewman 26 Jan '12

26 Jan '12

Author: phobos Date: 2012-01-26 21:01:33 +0000 (Thu, 26 Jan 2012) New Revision: 25353 Added: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png Log: bastards are still bastards in real name environments. Added: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2012-01-23-googleplus-realname-bastards-are-bastards-online.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 4f20a17a27de19ea754264bfeb025f8e5190d2b0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 18:15:21 2012 +0000 Update translations for vidalia_help --- de/config.po | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/de/config.po b/de/config.po index 31cd3f5..16e7cc6 100644 --- a/de/config.po +++ b/de/config.po @@ -1,5 +1,6 @@ # # Translators: +# <libertine(a)posteo.de>, 2012. # Nils <gibsorter(a)gmx.de>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-12-25 09:01+0000\n" -"Last-Translator: Nils <gibsorter(a)gmx.de>\n" +"PO-Revision-Date: 2012-01-26 18:06+0000\n" +"Last-Translator: libertine <libertine(a)posteo.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,6 +186,11 @@ msgid "" "href=\"bridges.html#finding\">finding bridge relays</a> for more information" " on how to learn new bridge relay addresses and fingerprints." msgstr "" +"Wenn Verbindungen zu normalen Tor relays geblockt sind, musst du eine bridge" +" relay Adresse in Erfahrung bringen und diese hier hinzufügen. Siehe auch " +"das Hilfe-Topic <a href=\"bridges.html#finding\">bridge relays finden</a> um" +" mehr Information zu neuen bridge relay Adressen und Fingerabdrücken zu " +"bekommen." #. type: Content of: <html><body> #: en/config.html:100

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 6b5246c0557535ec440259d3e7267784534b225e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 18:15:03 2012 +0000 Update translations for orbot --- values-de/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index f3f3b99..3918ecb 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -188,16 +188,16 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version"></string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> <string name="hidden_service_on">Verstckte Dienste auf:</string> <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> - <string name="pref_use_sys_iptables_title"></string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="pref_use_sys_iptables_title">Benutze die Standard (default) Iptables</string> + <string name="pref_use_sys_iptables_summary">Benutze den mitgelieferten Iptables-Binary anstatt des mit Orbot mitgelieferten.</string> + <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string> + <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string> + <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 26 Jan '12

26 Jan '12

commit 08e422db7c07fda678bae8ee6995940961a9a364 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 26 14:15:03 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 49c99f5..9daf30a 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -197,6 +197,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de in Orbot geïntegreerde.</string> <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string> + <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string> </resources>

1 0

[metrics-lib/master] Fiddle around with the download logic some more.
by karsten＠torproject.org 26 Jan '12

26 Jan '12

commit 9b6c7c517e22a3dd775397ad0500a7f73a172be4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 26 13:49:17 2012 +0100 Fiddle around with the download logic some more. --- .../descriptor/impl/DownloadCoordinatorImpl.java | 34 +++++++++++++------- 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 03e7997..c10f468 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -8,6 +8,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeSet; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; @@ -23,6 +25,7 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { return this.descriptorQueue; } + private SortedSet<String> runningDirectories; private SortedMap<String, DirectoryDownloader> directoryAuthorities; private SortedMap<String, DirectoryDownloader> directoryMirrors; private boolean downloadConsensusFromAllAuthorities; @@ -41,6 +44,9 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { long globalTimeoutMillis) { this.directoryAuthorities = directoryAuthorities; this.directoryMirrors = directoryMirrors; + this.runningDirectories = new TreeSet<String>(); + this.runningDirectories.addAll(directoryAuthorities.keySet()); + this.runningDirectories.addAll(directoryMirrors.keySet()); this.missingConsensus = downloadConsensus; this.downloadConsensusFromAllAuthorities = downloadConsensusFromAllAuthorities; @@ -189,6 +195,9 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { public synchronized void deliverResponse( DescriptorRequestImpl response) { String nickname = response.getDirectoryNickname(); + if (response.getException() != null) { + this.runningDirectories.remove(nickname); + } if (response.getDescriptorType().equals("consensus")) { this.requestingConsensuses.remove(nickname); if (response.getResponseCode() == 200) { @@ -238,21 +247,22 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { if ((this.missingConsensus || this.downloadConsensusFromAllAuthorities) && (!this.requestedConsensuses.containsAll( - this.directoryAuthorities.keySet()) || + this.runningDirectories) || !this.requestingConsensuses.isEmpty())) { doneDownloading = false; } - if (!this.missingVotes.isEmpty()) { - if (!this.requestingVotes.isEmpty() || - !this.requestedVotes.keySet().containsAll( - this.directoryAuthorities.keySet())) { - doneDownloading = false; - } else { - for (String missingVote : this.missingVotes) { - for (Set<String> reqVotes : this.requestedVotes.values()) { - if (!reqVotes.contains(missingVote)) { - doneDownloading = false; - } + if (!this.requestingVotes.isEmpty()) { + doneDownloading = false; + } else if (!this.requestedVotes.keySet().containsAll( + this.runningDirectories)) { + doneDownloading = false; + } else if (!this.missingVotes.isEmpty()) { + for (String missingVote : this.missingVotes) { + for (String runningDirectory : this.runningDirectories) { + Set<String> reqVotes = this.requestedVotes.get( + runningDirectory); + if (!reqVotes.contains(missingVote)) { + doneDownloading = false; } } }

1 0