- tor-commits - lists.torproject.org

[metrics-web/master] Redirect stderr, or it will be sent to the mailing list.
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit 889c5200bdc6bb18b1f23f3e2832878f4c84be59 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:51:04 2011 +0100 Redirect stderr, or it will be sent to the mailing list. In theory, our cronjob shouldn't include stderr in whatever it pipes to mail. But Ant doesn't make a difference between stdout and stderr and writes everything to stdout. When we grep Ant's output we include the stderr part, too. Now we explicitly redirect stderr to a file. We usually don't need it, but when something goes wrong, we might want to take a look. --- build.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index 32a450f..570c973 100644 --- a/build.xml +++ b/build.xml @@ -64,7 +64,8 @@ <target name="chc" depends="compile"> <java fork="true" maxmemory="512m" - classname="org.torproject.chc.Main"> + classname="org.torproject.chc.Main" + error="chc-stderr.txt"> <classpath refid="classpath"/> </java> </target>

1 0

[tor-cloud/master] Comment out some stuff and add another echo
by runa＠torproject.org 09 Nov '11

09 Nov '11

commit 83f797372dda229327c08c77a4a5018a9f885ea4 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Nov 9 08:38:18 2011 +0000 Comment out some stuff and add another echo --- build.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 760f867..0d4e47b 100755 --- a/build.sh +++ b/build.sh @@ -87,8 +87,8 @@ sleep 20 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" +#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" +#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local" @@ -131,6 +131,7 @@ NOW=$(date +"%m-%d-%Y") RANDOM=$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c8`) # Finally register and publish the image +echo "Registering and publishing the image..." ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}]" # cleanup

1 0

[tor-cloud/master] Make sure we mount the correct image, and not something that does not exist
by runa＠torproject.org 09 Nov '11

09 Nov '11

commit 9ba9c825d858567ac888bc2ec523d7788e19ddfd Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Nov 9 07:46:44 2011 +0000 Make sure we mount the correct image, and not something that does not exist --- build.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index d09580a..760f867 100755 --- a/build.sh +++ b/build.sh @@ -84,10 +84,11 @@ ec2-attach-volume --instance ${iid} --region ${region} --device /dev/sdh ${vol} echo "After attaching the volume, sleep for 20 seconds..." sleep 20 -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-uec-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification -#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt && cat /mnt/verify.txt | grep Good | awk {'print $2'})" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local"

1 0

[metrics-tasks/master] Add a bash script to make graphs (#2394).
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit abef2d21b1af690b55d745b4173da1740a2ffa14 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:31:09 2011 +0100 Add a bash script to make graphs (#2394). --- task-2394/README | 6 ++++++ task-2394/plot.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/task-2394/README b/task-2394/README index b58f1e8..dbf31fb 100644 --- a/task-2394/README +++ b/task-2394/README @@ -1,6 +1,12 @@ Visualize self-reported vs. measured bandwidth of relays ======================================================== +You can either + + - Run plot.sh. + +or run the steps manually: + - Download a single consensus and all referenced votes and server descriptors from the metrics website, e.g., diff --git a/task-2394/plot.sh b/task-2394/plot.sh new file mode 100755 index 0000000..d3744e0 --- /dev/null +++ b/task-2394/plot.sh @@ -0,0 +1,36 @@ +#!/bin/bash +COMMONS="commons-codec-1.4.jar" +CURRENT=`date -u +%Y-%m-%d-%H-00-00` + +if [ ! -f commons-codec-1.4.jar ]; then + echo "$COMMONS not found. Please download Apache Commons Codec 1.4." + exit 1 +fi + +if [ ! -d descriptors ]; then + mkdir descriptors +else + rm descriptors/* +fi + +echo "Downloading descriptors from the metrics website..." +curl https://metrics.torproject.org/votes?valid-after=$CURRENT \ + > descriptors/$CURRENT-votes +curl https://metrics.torproject.org/consensus?valid-after=$CURRENT \ + > descriptors/$CURRENT-consensus +curl https://metrics.torproject.org/serverdesc?valid-after=$CURRENT \ + > descriptors/$CURRENT-serverdesc + +if [ ! -f ParseDescriptors.class ]; then + echo "Compiling..." + javac -cp commons-codec-1.4.jar ParseDescriptors.java +fi + +echo "Parsing descriptors..." +java -cp .:commons-codec-1.4.jar ParseDescriptors + +echo "Plotting..." +R --slave -f bandwidth-comparison.R + +echo "Terminating. Please find the .png files in this directory." +

1 0

[metrics-tasks/master] There's a new bwauth in town, and it's going to be orange.
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit d91ae44fe39a8ed68368427e8b90dc027c4aa41c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:27:56 2011 +0100 There's a new bwauth in town, and it's going to be orange. --- task-2394/ParseDescriptors.java | 2 ++ task-2394/bandwidth-comparison.R | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/task-2394/ParseDescriptors.java b/task-2394/ParseDescriptors.java index 7ddab73..fbbc4b5 100644 --- a/task-2394/ParseDescriptors.java +++ b/task-2394/ParseDescriptors.java @@ -42,6 +42,8 @@ public class ParseDescriptors { "moria1"); bandwidthAuthorities.put("ED03BB616EB2F60BEC80151114BB25CEF515B226", "gabelmoo"); + bandwidthAuthorities.put("49015F787433103580E3B66A1707A00E60F2D15B", + "maatuska"); BufferedWriter bw = new BufferedWriter(new FileWriter( "bandwidth-comparison.csv")); bw.write("validafter,fingerprint,nickname,category," diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index 50739b7..56095ef 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/bandwidth-comparison.R @@ -40,6 +40,7 @@ cdf_relays_category_votes <- function(data, category) { urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth) moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth) gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth) + maatuska <- sort(d$maatuskabandwidth * 1000 / d$descriptorbandwidth) d <- data.frame(x = consensus, y = (1:length(consensus)) / length(consensus), source = "consensus", @@ -68,6 +69,12 @@ cdf_relays_category_votes <- function(data, category) { source = "gabelmoo", category = category)) } + if (length(maatuska) > 0) { + d <- rbind(d, data.frame(x = maatuska, + y = (1:length(maatuska)) / length(maatuska), + source = "maatuska", + category = category)) + } d } relays_category_votes <- rbind( @@ -87,7 +94,8 @@ scale_y_continuous("Fraction of relays\n", limits = c(0, 1), formatter = "percent") + scale_colour_manual("", c("consensus" = "black", "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), - "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5), + "maatuska" = alpha("orange", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", "consensus and votes\n"), legend.position = "right") @@ -127,7 +135,10 @@ cdf_measured_category_votes <- function(data, category) { measured = d$moria1bandwidth), "moria1", category), wecdf(data.frame( ratio = d$gabelmoobandwidth * 1000 / d$descriptorbandwidth, - measured = d$gabelmoobandwidth), "gabelmoo", category)) + measured = d$gabelmoobandwidth), "gabelmoo", category), + wecdf(data.frame( + ratio = d$maatuskabandwidth * 1000 / d$descriptorbandwidth, + measured = d$maatuskabandwidth), "maatuska", category)) d } measured_category_votes <- rbind( @@ -147,7 +158,8 @@ scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1), formatter = "percent") + scale_colour_manual("", c("consensus" = "black", "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), - "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5), + "maatuska" = alpha("orange", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", "consensus and votes\n"), legend.position = "right")

1 0

[metrics-tasks/master] Allow for the case that we're missing bwauth results (#2394).
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit 6eab08b32522d3d1640636822ba862578149f1b1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:16:58 2011 +0100 Allow for the case that we're missing bwauth results (#2394). --- task-2394/bandwidth-comparison.R | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index a4b0329..50739b7 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/bandwidth-comparison.R @@ -40,27 +40,34 @@ cdf_relays_category_votes <- function(data, category) { urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth) moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth) gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth) - d <- rbind( - data.frame(x = consensus, + d <- data.frame(x = consensus, y = (1:length(consensus)) / length(consensus), source = "consensus", - category = category), - data.frame(x = urras, + category = category) + if (length(urras) > 0) { + d <- rbind(d, data.frame(x = urras, y = (1:length(urras)) / length(urras), source = "urras", - category = category), - data.frame(x = ides, + category = category)) + } + if (length(ides) > 0) { + d <- rbind(d, data.frame(x = ides, y = (1:length(ides)) / length(ides), source = "ides", - category = category), - data.frame(x = moria1, + category = category)) + } + if (length(moria1) > 0) { + d <- rbind(d, data.frame(x = moria1, y = (1:length(moria1)) / length(moria1), source = "moria1", - category = category), - data.frame(x = gabelmoo, + category = category)) + } + if (length(gabelmoo) > 0) { + d <- rbind(d, data.frame(x = gabelmoo, y = (1:length(gabelmoo)) / length(gabelmoo), source = "gabelmoo", category = category)) + } d } relays_category_votes <- rbind(

1 0

[metrics-tasks/master] Oops, looks like the Java file does care about filenames.
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit b372261323a670af7b72845b98c94fbf9bd7877a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:12:31 2011 +0100 Oops, looks like the Java file does care about filenames. --- task-2394/ParseDescriptors.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-2394/ParseDescriptors.java b/task-2394/ParseDescriptors.java index 641518d..7ddab73 100644 --- a/task-2394/ParseDescriptors.java +++ b/task-2394/ParseDescriptors.java @@ -21,7 +21,7 @@ public class ParseDescriptors { consensuses.put(filename, file); } else if (filename.endsWith("-votes")) { votes.put(filename, file); - } else if (filename.endsWith("-descriptors")) { + } else if (filename.endsWith("-serverdesc")) { descriptors.put(filename, file); } } @@ -90,7 +90,7 @@ public class ParseDescriptors { /* Parse referenced server descriptors to learn about exit policies * and reported bandwidths. */ - String descriptorsFilename = consensusTimestamp + "-descriptors"; + String descriptorsFilename = consensusTimestamp + "-serverdesc"; Map<String, String> parsedDescriptors = new HashMap<String, String>(); if (descriptors.containsKey(descriptorsFilename)) {

1 0

[metrics-tasks/master] Clarify the README a tiny bit (#2394).
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit ec81f22d558c63b51bed5009e8bf33863e81a6c5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 07:41:50 2011 +0100 Clarify the README a tiny bit (#2394). --- task-2394/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-2394/README b/task-2394/README index 774dff2..b58f1e8 100644 --- a/task-2394/README +++ b/task-2394/README @@ -13,7 +13,7 @@ Visualize self-reported vs. measured bandwidth of relays 2011-07-13-05-00-00-consensus 2011-07-13-05-00-00-votes - 2011-07-13-05-00-00-descriptors + 2011-07-13-05-00-00-serverdesc - Download Apache Commons Codec 1.4 or higher and put in in this directory.

1 0

[tor/master] Rewrite comment at head of eventdns.c
by nickm＠torproject.org 09 Nov '11

09 Nov '11

commit d4489a2851f6bfe429c33578e2f4f9c127598b8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 00:23:44 2011 -0500 Rewrite comment at head of eventdns.c Let's make it more obvious to the everyday reader that eventdns.c is a) Based on Libevent's evdns.c b) Slated for demolition c) Supposed to keep API-compatibility with Libevent. d) Not worth tweaking unless there's a bug. --- src/or/eventdns.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 29e2d3a..7cd5d80 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1,12 +1,18 @@ -/* The original version of this module was written by Adam Langley; for - * a history of modifications, check out the subversion logs. +/* READ THIS COMMENT BEFORE HACKING THIS FILE. * - * When editing this module, try to keep it re-mergeable by Adam. Don't - * reformat the whitespace, add Tor dependencies, or so on. + * This eventdns.c copy has diverged a bit from Libevent's version, and it's + * no longer easy to resynchronize them. Once Tor requires Libevent 2.0, we + * will just dump this file and use Libevent's evdns code. * - * TODO: - * - Replace all externally visible magic numbers with #defined constants. - * - Write documentation for APIs of all external functions. + * Therefore, you probably shouldn't make any change here without making it to + * Libevent as well: it's not good for the implementation to diverge even + * more. Also, we can't shouldn't wantonly the API here (since Libevent APIs + * can't change in ways that break user behavior). Also, we shouldn't bother + * with cosmetic changes: the whole module is slated for demolition, so + * there's no point dusting the linebreaks or re-painting the parser. + * + * (We can't just drop the Libevent 2.0 evdns implementation in here instead, + * since it depends pretty heavily on parts of Libevent 2.0.) */ /* Async DNS Library

1 0

r25200: {website} add new mirror, refresh mirror status (in website/trunk: . include)
by Andrew Lewman 09 Nov '11

09 Nov '11

Author: phobos Date: 2011-11-09 02:45:31 +0000 (Wed, 09 Nov 2011) New Revision: 25200 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add new mirror, refresh mirror status Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-11-07 01:46:38 UTC (rev 25199) +++ website/trunk/include/mirrors-table.wmi 2011-11-09 02:45:31 UTC (rev 25200) @@ -86,23 +86,6 @@ <tr> - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>BarkerJr</td> @@ -171,6 +154,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>AT</td> <td>FoDT.IT</td> @@ -241,6 +241,23 @@ <td>DE</td> + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td>factor.cc</td> <td>Up to date</td> @@ -290,6 +307,23 @@ <tr> + <td>DE</td> + + <td>beme it</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> + <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> +</tr> + +<tr> + <td>US</td> <td>NW Linux</td> @@ -324,6 +358,23 @@ <tr> + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>LazyTiger</td> @@ -358,32 +409,32 @@ <tr> - <td>LT</td> + <td>DE</td> - <td></td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>IS</td> - <td>AskApache</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,23 +545,6 @@ <tr> - <td>DE</td> - - <td>beme it</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> - <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - <td>NL</td> <td></td> @@ -528,23 +562,6 @@ <tr> - <td>DE</td> - - <td>[[:bbs:]]</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>INT</td> <td>CoralCDN</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-11-07 01:46:38 UTC (rev 25199) +++ website/trunk/update-mirrors.pl 2011-11-09 02:45:31 UTC (rev 25200) @@ -730,6 +730,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror046 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.open-networx.org/torproject.org/", + httpsWebsiteMirror => "https://mirror.open-networx.org/torproject.org/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.open-networx.org/torproject.org/dist/", + httpsDistMirror => "https://mirror.open-networx.org/torproject.org/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0