- tor-commits - lists.torproject.org

[tor-cloud/master] Add GPG key to ec2-prep.sh, solves #4808
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit f852fc91b24959800d23dc960dc1df6f23eadd99 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 14:50:22 2012 +0000 Add GPG key to ec2-prep.sh, solves #4808 --- ec2-prep.sh | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 2 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index de985cd..0e9f712 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -14,6 +14,7 @@ PERIODIC="/etc/apt/apt.conf.d/10periodic" UNATTENDED_UPGRADES="/etc/apt/apt.conf.d/50unattended-upgrades" IPTABLES_RULES="/etc/iptables.rules" NETWORK="/etc/network/interfaces" +GPGKEY="/etc/apt/trusted.gpg.d/tor.asc" # Make sure that we are root if [ "$USER" != "root" ]; then @@ -109,8 +110,113 @@ EOF # Install Tor's GPG key echo "Installing Tor's gpg key..."; -gpg --keyserver keys.gnupg.net --recv 886DDD89 -gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - +#gpg --keyserver keys.gnupg.net --recv 886DDD89 +#gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - +cat << EOF > $TORKEY +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +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 +yIJpnL6TsA5uFqUosz2rOPKeeDOtruSo490PTA== +=MGuX +-----END PGP PUBLIC KEY BLOCK----- +EOF +apt-key add $GPGKEY # Install Tor echo "Installing Tor...";

1 0

r25311: {website} revert back to orbot 1.0.6 until android 2.2 problems are fi (website/trunk/include)
by Andrew Lewman 16 Jan '12

16 Jan '12

Author: phobos Date: 2012-01-16 13:47:56 +0000 (Mon, 16 Jan 2012) New Revision: 25311 Modified: website/trunk/include/versions.wmi Log: revert back to orbot 1.0.6 until android 2.2 problems are fixed. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-16 11:12:17 UTC (rev 25310) +++ website/trunk/include/versions.wmi 2012-01-16 13:47:56 UTC (rev 25311) @@ -54,11 +54,11 @@ <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag> -<define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.7-RC1</define-tag> +<define-tag version-androidbundle-tor whitespace=delete>0.2.3.7-alpha</define-tag> +<define-tag version-androidbundle-orbot whitespace=delete>1.0.6-</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>.apk</define-tag> +<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>-FINAL.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag>

1 0

[metrics-db/master] Move unit tests to a separate source tree.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit b7cc7e3f6192b7aaaeac7422db28026c512ccd7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 14:31:32 2012 +0100 Move unit tests to a separate source tree. --- build.xml | 12 ++++++ .../torproject/ernie/test/ArchiveReaderTest.java | 33 ----------------- .../torproject/ernie/test/ArchiveWriterTest.java | 30 --------------- .../ernie/test/BridgeSnapshotReaderTest.java | 33 ----------------- .../test/CachedRelayDescriptorReaderTest.java | 32 ---------------- .../ernie/test/SanitizedBridgesWriterTest.java | 39 -------------------- .../org/torproject/ernie/db/ArchiveReaderTest.java | 33 +++++++++++++++++ .../org/torproject/ernie/db/ArchiveWriterTest.java | 30 +++++++++++++++ .../ernie/db/BridgeSnapshotReaderTest.java | 33 +++++++++++++++++ .../ernie/db/CachedRelayDescriptorReaderTest.java | 32 ++++++++++++++++ .../ernie/db/SanitizedBridgesWriterTest.java | 39 ++++++++++++++++++++ 11 files changed, 179 insertions(+), 167 deletions(-) diff --git a/build.xml b/build.xml index 678a088..3f187be 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,7 @@ <project default="run" name="ERNIE" basedir="."> <property name="sources" value="src/"/> <property name="classes" value="bin/"/> + <property name="tests" value="test"/> <property name="docs" value="javadoc/"/> <property name="name" value="ERNIE"/> <path id="classpath"> @@ -38,6 +39,17 @@ </javadoc> </target> <target name="test" depends="compile"> + <javac destdir="${classes}" + srcdir="${tests}" + source="1.5" + target="1.5" + debug="true" + deprecation="true" + optimize="false" + failonerror="true" + includeantruntime="false"> + <classpath refid="classpath"/> + </javac> <junit haltonfailure="true" printsummary="off"> <classpath refid="classpath"/> <formatter type="plain" usefile="false"/> diff --git a/src/org/torproject/ernie/test/ArchiveReaderTest.java b/src/org/torproject/ernie/test/ArchiveReaderTest.java deleted file mode 100644 index 4099ee3..0000000 --- a/src/org/torproject/ernie/test/ArchiveReaderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.test; - -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; - -public class ArchiveReaderTest { - - private File tempArchivesDirectory; - private File tempStatsDirectory; - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @Before - public void createTempDirectories() { - this.tempArchivesDirectory = folder.newFolder("sanitized-bridges"); - this.tempStatsDirectory = folder.newFolder("stats"); - } - - @Test(expected = IllegalArgumentException.class) - public void testRelayDescriptorParserNull() { - new ArchiveReader(null, this.tempArchivesDirectory, - this.tempStatsDirectory, false); - } -} - diff --git a/src/org/torproject/ernie/test/ArchiveWriterTest.java b/src/org/torproject/ernie/test/ArchiveWriterTest.java deleted file mode 100644 index fb34f65..0000000 --- a/src/org/torproject/ernie/test/ArchiveWriterTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.test; - -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; - -public class ArchiveWriterTest { - - private File tempArchivesDirectory; - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @Before - public void createTempDirectories() { - this.tempArchivesDirectory = folder.newFolder("archives"); - } - - @Test(expected = IllegalArgumentException.class) - public void testArchivesDirectoryNull() { - new ArchiveWriter(null); - } -} - diff --git a/src/org/torproject/ernie/test/BridgeSnapshotReaderTest.java b/src/org/torproject/ernie/test/BridgeSnapshotReaderTest.java deleted file mode 100644 index 93d1642..0000000 --- a/src/org/torproject/ernie/test/BridgeSnapshotReaderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.test; - -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; - -public class BridgeSnapshotReaderTest { - - private File tempBridgeDirectoriesDirectory; - private File tempStatsDirectory; - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @Before - public void createTempDirectories() { - this.tempBridgeDirectoriesDirectory = folder.newFolder("bridges"); - this.tempStatsDirectory = folder.newFolder("stats"); - } - - @Test(expected = IllegalArgumentException.class) - public void testBridgeDescriptorParserNull() { - new BridgeSnapshotReader(null, this.tempBridgeDirectoriesDirectory, - this.tempStatsDirectory); - } -} - diff --git a/src/org/torproject/ernie/test/CachedRelayDescriptorReaderTest.java b/src/org/torproject/ernie/test/CachedRelayDescriptorReaderTest.java deleted file mode 100644 index 22b2018..0000000 --- a/src/org/torproject/ernie/test/CachedRelayDescriptorReaderTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.test; - -import org.torproject.ernie.db.*; - -import java.io.*; -import java.util.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; - -public class CachedRelayDescriptorReaderTest { - - private File tempStatsDirectory; - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @Before - public void createTempDirectories() { - this.tempStatsDirectory = folder.newFolder("stats"); - } - - @Test(expected = IllegalArgumentException.class) - public void testRelayDescriptorParserNull() { - new CachedRelayDescriptorReader(null, new ArrayList<String>(), - this.tempStatsDirectory); - } -} - diff --git a/src/org/torproject/ernie/test/SanitizedBridgesWriterTest.java b/src/org/torproject/ernie/test/SanitizedBridgesWriterTest.java deleted file mode 100644 index f5b3b64..0000000 --- a/src/org/torproject/ernie/test/SanitizedBridgesWriterTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.test; - -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; - -public class SanitizedBridgesWriterTest { - - private File tempSanitizedBridgesDirectory; - private File tempStatsDirectory; - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); - - @Before - public void createTempDirectories() { - this.tempSanitizedBridgesDirectory = - folder.newFolder("sanitized-bridges"); - this.tempStatsDirectory = folder.newFolder("stats"); - } - - @Test(expected = IllegalArgumentException.class) - public void testSanitizedBridgesDirectoryNull() { - new SanitizedBridgesWriter(null, this.tempStatsDirectory, false, -1L); - } - - @Test(expected = IllegalArgumentException.class) - public void testStatsDirectoryNull() { - new SanitizedBridgesWriter(this.tempSanitizedBridgesDirectory, null, - false, -1L); - } -} - diff --git a/test/org/torproject/ernie/db/ArchiveReaderTest.java b/test/org/torproject/ernie/db/ArchiveReaderTest.java new file mode 100644 index 0000000..5779865 --- /dev/null +++ b/test/org/torproject/ernie/db/ArchiveReaderTest.java @@ -0,0 +1,33 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.db; + +import org.torproject.ernie.db.*; + +import java.io.*; + +import org.junit.*; +import org.junit.rules.*; +import static org.junit.Assert.*; + +public class ArchiveReaderTest { + + private File tempArchivesDirectory; + private File tempStatsDirectory; + + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + @Before + public void createTempDirectories() { + this.tempArchivesDirectory = folder.newFolder("sanitized-bridges"); + this.tempStatsDirectory = folder.newFolder("stats"); + } + + @Test(expected = IllegalArgumentException.class) + public void testRelayDescriptorParserNull() { + new ArchiveReader(null, this.tempArchivesDirectory, + this.tempStatsDirectory, false); + } +} + diff --git a/test/org/torproject/ernie/db/ArchiveWriterTest.java b/test/org/torproject/ernie/db/ArchiveWriterTest.java new file mode 100644 index 0000000..3ae9abc --- /dev/null +++ b/test/org/torproject/ernie/db/ArchiveWriterTest.java @@ -0,0 +1,30 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.db; + +import org.torproject.ernie.db.*; + +import java.io.*; + +import org.junit.*; +import org.junit.rules.*; +import static org.junit.Assert.*; + +public class ArchiveWriterTest { + + private File tempArchivesDirectory; + + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + @Before + public void createTempDirectories() { + this.tempArchivesDirectory = folder.newFolder("archives"); + } + + @Test(expected = IllegalArgumentException.class) + public void testArchivesDirectoryNull() { + new ArchiveWriter(null); + } +} + diff --git a/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java new file mode 100644 index 0000000..93d1642 --- /dev/null +++ b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java @@ -0,0 +1,33 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.test; + +import org.torproject.ernie.db.*; + +import java.io.*; + +import org.junit.*; +import org.junit.rules.*; +import static org.junit.Assert.*; + +public class BridgeSnapshotReaderTest { + + private File tempBridgeDirectoriesDirectory; + private File tempStatsDirectory; + + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + @Before + public void createTempDirectories() { + this.tempBridgeDirectoriesDirectory = folder.newFolder("bridges"); + this.tempStatsDirectory = folder.newFolder("stats"); + } + + @Test(expected = IllegalArgumentException.class) + public void testBridgeDescriptorParserNull() { + new BridgeSnapshotReader(null, this.tempBridgeDirectoriesDirectory, + this.tempStatsDirectory); + } +} + diff --git a/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java new file mode 100644 index 0000000..b856fb0 --- /dev/null +++ b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java @@ -0,0 +1,32 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.db; + +import org.torproject.ernie.db.*; + +import java.io.*; +import java.util.*; + +import org.junit.*; +import org.junit.rules.*; +import static org.junit.Assert.*; + +public class CachedRelayDescriptorReaderTest { + + private File tempStatsDirectory; + + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + @Before + public void createTempDirectories() { + this.tempStatsDirectory = folder.newFolder("stats"); + } + + @Test(expected = IllegalArgumentException.class) + public void testRelayDescriptorParserNull() { + new CachedRelayDescriptorReader(null, new ArrayList<String>(), + this.tempStatsDirectory); + } +} + diff --git a/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java new file mode 100644 index 0000000..dd05870 --- /dev/null +++ b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java @@ -0,0 +1,39 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.db; + +import org.torproject.ernie.db.*; + +import java.io.*; + +import org.junit.*; +import org.junit.rules.*; +import static org.junit.Assert.*; + +public class SanitizedBridgesWriterTest { + + private File tempSanitizedBridgesDirectory; + private File tempStatsDirectory; + + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + @Before + public void createTempDirectories() { + this.tempSanitizedBridgesDirectory = + folder.newFolder("sanitized-bridges"); + this.tempStatsDirectory = folder.newFolder("stats"); + } + + @Test(expected = IllegalArgumentException.class) + public void testSanitizedBridgesDirectoryNull() { + new SanitizedBridgesWriter(null, this.tempStatsDirectory, false, -1L); + } + + @Test(expected = IllegalArgumentException.class) + public void testStatsDirectoryNull() { + new SanitizedBridgesWriter(this.tempSanitizedBridgesDirectory, null, + false, -1L); + } +} +

1 0

[metrics-lib/master] Looks like $fingerprint=nickname is a valid family line entry.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 6a46f46bd0e6e8e155812d6e2593d936e287d7ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 12:42:25 2012 +0100 Looks like $fingerprint=nickname is a valid family line entry. --- .../torproject/descriptor/ServerDescriptor.java | 6 +++--- .../descriptor/impl/ServerDescriptorImpl.java | 14 +++++++++++--- .../descriptor/impl/ServerDescriptorImplTest.java | 11 +++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/ServerDescriptor.java b/src/org/torproject/descriptor/ServerDescriptor.java index 98a0f02..631779e 100644 --- a/src/org/torproject/descriptor/ServerDescriptor.java +++ b/src/org/torproject/descriptor/ServerDescriptor.java @@ -62,9 +62,9 @@ public interface ServerDescriptor extends Descriptor { * information is included in the descriptor. */ public String getContact(); - /* Return the nicknames or ($-prefixed) fingerprints contained in the - * family line of this relay, or null if the descriptor does not contain - * a family line. */ + /* Return the nicknames, ($-prefixed) fingerprints, or + * $fingerprint=nickname tuples contained in the family line of this + * relay, or null if the descriptor does not contain a family line. */ public List<String> getFamilyEntries(); /* Return the relay's read history. (Current Tor versions include their diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 411e8c9..9fbcd84 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -287,9 +287,17 @@ public class ServerDescriptorImpl extends DescriptorImpl this.familyEntries = new ArrayList<String>(); for (int i = 1; i < partsNoOpt.length; i++) { if (partsNoOpt[i].startsWith("$")) { - this.familyEntries.add("$" - + ParseHelper.parseTwentyByteHexString(line, - partsNoOpt[i].substring(1))); + if (partsNoOpt[i].contains("=")) { + String fingerprint = ParseHelper.parseTwentyByteHexString(line, + partsNoOpt[i].substring(1, partsNoOpt[i].indexOf("="))); + String nickname = ParseHelper.parseNickname(line, + partsNoOpt[i].substring(partsNoOpt[i].indexOf("=") + 1)); + this.familyEntries.add("$" + fingerprint + "=" + nickname); + } else { + this.familyEntries.add("$" + + ParseHelper.parseTwentyByteHexString(line, + partsNoOpt[i].substring(1))); + } } else { this.familyEntries.add(ParseHelper.parseNickname(line, partsNoOpt[i])); diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index f699694..6a3ba3a 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -836,6 +836,17 @@ public class ServerDescriptorImplTest { } @Test() + public void testFamilyFingerprintNickname() + throws DescriptorParseException { + ServerDescriptor descriptor = DescriptorBuilder. + createWithFamilyLine("family " + + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD=saberrider2008"); + assertEquals(Arrays.asList(new String[] + { "$D8733048FC8EC9102466AD8F3098622BF1BF71FD=saberrider2008" }), + descriptor.getFamilyEntries()); + } + + @Test() public void testWriteHistory() throws DescriptorParseException { String writeHistoryLine = "write-history 2012-01-01 03:51:44 (900 s) " + "4345856,261120,7591936,1748992";

1 0

r25310: {website} Remove xenobite references (in website/trunk: docs/en projects/en)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 11:12:17 +0000 (Mon, 16 Jan 2012) New Revision: 25310 Modified: website/trunk/docs/en/documentation.wml website/trunk/projects/en/projects.wml Log: Remove xenobite references Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-01-16 10:56:03 UTC (rev 25309) +++ website/trunk/docs/en/documentation.wml 2012-01-16 11:12:17 UTC (rev 25310) @@ -247,11 +247,9 @@ list of supporting programs you might want to use in association with Tor</a>.</li> <li><a href="https://check.torproject.org/">The - Tor detector</a> or <a href="http://torcheck.xenobite.eu/">the other - Tor detector</a> try to guess if you're using Tor or not.</li> + Tor detector</a> tries to guess if you're using Tor or not.</li> <li>Check out one of the Tor status pages, such as <a - href="http://torstatus.blutmagie.de/">blutmagie's</a>, or - Xenobite's <a href="https://torstat.xenobite.eu/">Tor node status</a> page. + href="http://torstatus.blutmagie.de/">blutmagie's Tor node status</a> page. Remember that these lists may not be as accurate as what your Tor client uses, because your client fetches its own directory information and examines it locally.</li> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-01-16 10:56:03 UTC (rev 25309) +++ website/trunk/projects/en/projects.wml 2012-01-16 11:12:17 UTC (rev 25310) @@ -63,8 +63,7 @@ <div class="name"><a href="http://torstatus.blutmagie.de/">TorStatus</a></div> <p>Portal providing an overview of the Tor network, including a list of its current relays and details on each. Mirrors are also available from <a -href="https://torstat.xenobite.eu/">Xenobite</a>, <a -href="http://torstatus.cyberphunk.org/">cyberphunk</a>, and others.</p> +href="http://torstatus.cyberphunk.org/">cyberphunk</a> and others.</p> </td> <td> <div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div>

1 0

[metrics-tasks/master] Add graphing code for #4686.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 7469525be32159d6ca783f5e5c7e8af2c0856588 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 11:55:07 2012 +0100 Add graphing code for #4686. --- task-4686/.gitignore | 4 ++++ task-4686/download-stats.R | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/task-4686/.gitignore b/task-4686/.gitignore new file mode 100644 index 0000000..23b548f --- /dev/null +++ b/task-4686/.gitignore @@ -0,0 +1,4 @@ +Rplots.pdf +download-stats.csv +download-stats.png + diff --git a/task-4686/download-stats.R b/task-4686/download-stats.R new file mode 100644 index 0000000..bdc599c --- /dev/null +++ b/task-4686/download-stats.R @@ -0,0 +1,13 @@ +library(ggplot2) +d <- read.csv("download-stats.csv", header = FALSE, + col.names = c("dirauth", "download", "seconds")) +ggplot(d, aes(x = as.POSIXct(download / 1000, + origin = "1970-01-01 00:00:00"), y = seconds / 1000)) + +geom_point(alpha = 0.25) + +facet_wrap(~ dirauth) + +scale_x_datetime(name = "", major = "1 month", minor = "1 week", + format = "%b %d, %Y") + +scale_y_continuous(name = "", limits = c(0, max(d$seconds) / 1000)) + +opts(title = "Consensus download times in seconds\n") +ggsave("download-stats.png", width = 8, height = 6, dpi = 100) +

1 0

r25309: {website} Revert part of "get all the expert bundle versions" This rev (website/trunk)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 10:56:03 +0000 (Mon, 16 Jan 2012) New Revision: 25309 Modified: website/trunk/Makefile website/trunk/publish Log: Revert part of "get all the expert bundle versions" This reverts commit 2790f8f20f2398eda08bd8e98b4930327a63b8eb. Looks like some stuff got accidentally committed, most importantly the make clean removal and the change of the stable/alpha version Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-01-16 10:47:27 UTC (rev 25308) +++ website/trunk/Makefile 2012-01-16 10:56:03 UTC (rev 25309) @@ -2,7 +2,7 @@ # # 1. Clone the Tor git repository and make TORGIT point to it: # -# git clone git://git.torproject.org/tor/ tor +# git clone git://git.torproject.org/tor/ tor.git # # Note that you will need to point to the actual .git directory. # 2. Edit include/versions.wmi or others if you like @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/Users/erinn/src/tor.git/.git -export STABLETAG=tor-0.2.2.24-alpha -export DEVTAG=tor-0.2.2.24-alpha +export TORGIT=set this to your tor.git path +export STABLETAG=tor-0.2.2.35 +export DEVTAG=tor-0.2.3.10-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-01-16 10:47:27 UTC (rev 25308) +++ website/trunk/publish 2012-01-16 10:56:03 UTC (rev 25309) @@ -1,8 +1,13 @@ #!/bin/sh set -e # stop if we encounter an error +# pull the latest changes svn update + +# clean up the working directory make clean + +# actually build the site make -j3 # don't copy over stuff with permissions that make it useless

1 0

r25308: {website} Comment out IM TBB section (website/trunk/projects/en)
by Sebastian Hahn 16 Jan '12

16 Jan '12

Author: sebastian Date: 2012-01-16 10:47:27 +0000 (Mon, 16 Jan 2012) New Revision: 25308 Modified: website/trunk/projects/en/torbrowser-split.wml Log: Comment out IM TBB section Modified: website/trunk/projects/en/torbrowser-split.wml =================================================================== --- website/trunk/projects/en/torbrowser-split.wml 2012-01-16 00:39:25 UTC (rev 25307) +++ website/trunk/projects/en/torbrowser-split.wml 2012-01-16 10:47:27 UTC (rev 25308) @@ -59,7 +59,7 @@ </ul> - <p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, split edition, 24 MB total)</p> + <p>Note that the Firefox in our bundle is <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a href="http://www.mozilla.com/firefox/">default Firefox</a>;

1 0

[doctor/master] Fix error message.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 561ffcecea6f8d466c05719dfd06442a14c3e64f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 11:38:53 2012 +0100 Fix error message. --- src/org/torproject/doctor/StatusFileReport.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 18def6f..040a687 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -50,8 +50,9 @@ public class StatusFileReport { String line; while ((line = br.readLine()) != null) { if (!line.contains(": ")) { - System.err.println("Bad line in stats/chc-last-warned: '" - + line + "'. Ignoring this line."); + System.err.println("Bad line in " + + lastWarnedFile.getAbsolutePath() + ": '" + line + + "'. Ignoring this line."); continue; } long warnedMillis = Long.parseLong(line.substring(0,

1 0

[stem/master] Minor update to stem/util/conf.py
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 6c5f0205682877c76d6633abce487673787f5d9b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Jan 14 21:32:31 2012 +0530 Minor update to stem/util/conf.py - More pythonic way of doing File I/O - Use try and catch the exception while parsing the config file instead of using an if-else logic. - Log messages when the (key, value) are not provided in the proper format in the config file. - Typos --- stem/util/conf.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 4c468d7..c226f40 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -150,9 +150,8 @@ class Config(): permissions, etc) """ - config_file = open(path, "r") - read_contents = config_file.readlines() - config_file.close() + with open(path, "r") as config_file: + read_contents = config_file.readlines() self._contents_lock.acquire() self._raw_contents = read_contents @@ -165,11 +164,12 @@ class Config(): # parse the key/value pair if line: - if " " in line: + try: key, value = line.split(" ", 1) - value = value.strip() - else: + except ValueError: + log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" + value = value.strip() self.set(key, value) @@ -333,7 +333,7 @@ class Config(): def get_value(self, key, default = None, multiple = False): """ - This provides the currently value associated with a given key. + This provides the current value associated with a given key. Arguments: key (str) - config setting to be fetched

1 0