[or-cvs] [ernie/master 3/8] Make minor changes to JSP website and remove old website.
karsten at torproject.org
karsten at torproject.org
Wed Jul 7 09:36:48 UTC 2010
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Sat, 3 Jul 2010 12:56:21 +0200
Subject: Make minor changes to JSP website and remove old website.
Commit: 9ae3b5a320ca1db12061ec15d524375502d715bf
---
build.xml | 20 +-
etc/build.properties | 12 -
etc/web.xml | 126 --
jsp/etc/build.properties | 12 +
jsp/war/WEB-INF/templates/footer.tpl.jsp | 7 +-
jsp/war/WEB-INF/templates/graphs.tpl.jsp | 233 ++--
.../WEB-INF/templates/graphs_bridge-users.tpl.jsp | 69 +-
.../WEB-INF/templates/graphs_exit-relays.tpl.jsp | 30 +-
jsp/war/WEB-INF/templates/graphs_gettor.tpl.jsp | 26 +-
.../WEB-INF/templates/graphs_network-size.tpl.jsp | 27 +-
jsp/war/WEB-INF/templates/graphs_new-users.tpl.jsp | 187 +--
.../templates/graphs_recurring-users.tpl.jsp | 194 +---
jsp/war/WEB-INF/templates/graphs_torperf.tpl.jsp | 76 +-
jsp/war/WEB-INF/templates/index.tpl.jsp | 2 -
jsp/war/WEB-INF/templates/main.tpl.jsp | 17 +-
jsp/war/WEB-INF/templates/research.tpl.jsp | 24 +-
jsp/war/WEB-INF/templates/research_data.tpl.jsp | 2 -
jsp/war/WEB-INF/templates/research_papers.tpl.jsp | 2 -
jsp/war/WEB-INF/templates/research_tools.tpl.jsp | 2 -
jsp/war/WEB-INF/templates/status.tpl.jsp | 26 +-
jsp/war/WEB-INF/web.xml | 46 -
jsp/war/index.jsp | 2 -
jsp/war/research.jsp | 2 -
jsp/war/status.jsp | 2 -
.../ernie/web/BridgeUsersGraphsServlet.java | 111 --
.../ernie/web/ConsensusGraphsServlet.java | 118 --
.../ernie/web/ExitRelaysGraphsServlet.java | 111 --
.../ernie/web/NewUsersGraphsServlet.java | 108 --
.../ernie/web/RecurringUsersGraphsServlet.java | 113 --
website/data.html | 1301 --------------------
website/gettor-graphs.html | 53 -
website/graphs.html | 157 ---
website/index.html | 97 --
website/papers.html | 102 --
website/research.html | 47 -
website/status.html | 49 -
website/tools.html | 125 --
website/torperf-graphs.html | 78 --
38 files changed, 388 insertions(+), 3328 deletions(-)
delete mode 100644 etc/build.properties
delete mode 100644 etc/web.xml
create mode 100644 jsp/etc/build.properties
delete mode 100644 src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
delete mode 100644 src/org/torproject/ernie/web/ConsensusGraphsServlet.java
delete mode 100644 src/org/torproject/ernie/web/ExitRelaysGraphsServlet.java
delete mode 100644 src/org/torproject/ernie/web/NewUsersGraphsServlet.java
delete mode 100644 src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
delete mode 100644 website/data.html
delete mode 100644 website/gettor-graphs.html
delete mode 100644 website/graphs.html
delete mode 100644 website/index.html
delete mode 100644 website/papers.html
delete mode 100644 website/research.html
delete mode 100644 website/status.html
delete mode 100644 website/tools.html
delete mode 100644 website/torperf-graphs.html
diff --git a/build.xml b/build.xml
index f70252b..115bbbb 100644
--- a/build.xml
+++ b/build.xml
@@ -3,19 +3,19 @@
<property name="sources" value="src/"/>
<property name="classes" value="bin/"/>
<property name="docs" value="javadoc/"/>
- <property name="config" value="etc/"/>
<property name="name" value="ERNIE"/>
<!--JSP specific build properties -->
- <property file="${config}/build.properties"/>
+ <property file="${jsp-basedir}/etc/build.properties"/>
<property name="jsp-basedir" value="jsp"/>
<property name="jsp-srcdir" value="${jsp-basedir}/src"/>
<property name="jsp-webdir" value="${jsp-basedir}/war"/>
+ <property name="jsp-libdir" value="${jsp-webdir}/WEB-INF/lib">
<property name="jsp-builddir" value="${jsp-webdir}/WEB-INF/classes"/>
<property name="jsp-name" value="ernie"/>
<path id="jsp-master-classpath">
- <fileset dir="${jsp-webdir}/WEB-INF/lib">
+ <fileset dir="${jsp-libdir}">
<include name="*.jar"/>
</fileset>
<!-- We need the servlet API classes: -->
@@ -34,7 +34,8 @@
<echo message="-----------------------------------"/>
<echo message=""/>
- <echo message="init --> Compile ERNIE"/>
+ <echo message="init --> Initialize ERNIE directories"/>
+ <echo message="compile --> Compile ERNIE"/>
<echo message="run --> Run ERNIE"/>
<echo message="docs --> Generate ERNIE javadoc tree to javadoc/"/>
<echo message=""/>
@@ -43,7 +44,7 @@
<echo message=""/>
<echo message="jsp-build --> Build JSP website from jsp/"/>
- <echo message="jsp-deploy --> Deploy JSP website (depends on etc/build.properties)"/>
+ <echo message="jsp-deploy --> Deploy JSP website (depends on jsp/etc/build.properties)"/>
<echo message="jsp-war --> Deploy JSP website in web archive (.war)"/>
<echo message=""/>
</target>
@@ -99,7 +100,7 @@
deprecation="true"
optimize="false"
failonerror="true"
- classpath="${jsp-webdir}/WEB-INF/lib/postgresql-8.4-701.jdbc4.jar">
+ classpath="${jsp-libdir}/postgresql-8.4-701.jdbc4.jar">
<src path="${jsp-srcdir}"/>
<classpath refid="jsp-master-classpath"/>
</javac>
@@ -120,11 +121,8 @@
<include name="**/*.*"/>
</fileset>
</war>
- <copy todir="${deploy.path}" preservelastmodified="true">
- <fileset dir=".">
- <include name="*.war"/>
- </fileset>
- </copy>
+ <copy todir="${deploy.path}" file="${jsp-name}.war"
+ preservelastmodified="true"/>
</target>
<!--Tomcat specific targets for application management-->
diff --git a/etc/build.properties b/etc/build.properties
deleted file mode 100644
index 6969e8d..0000000
--- a/etc/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# Ant properties for building and deploying the jsp section of the website
-
-appserver.home=/usr/local/tomcat
-# for Tomcat 5 use $appserver.home}/server/lib
-# for Tomcat 6 use $appserver.home}/lib
-appserver.lib=${appserver.home}/lib
-
-deploy.path=${appserver.home}/webapps
-
-tomcat.manager.url=http://localhost:8080/manager/html
-tomcat.manager.username=username
-tomcat.manager.password=password
diff --git a/etc/web.xml b/etc/web.xml
deleted file mode 100644
index 478be08..0000000
--- a/etc/web.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
- <!--<servlet>
- <servlet-name>NetworkSize</servlet-name>
- <servlet-class>org.torproject.ernie.web.NetworkSizeServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>NetworkSize</servlet-name>
- <url-pattern>/networksize.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>Image</servlet-name>
- <servlet-class>org.torproject.ernie.web.ImageServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Image</servlet-name>
- <url-pattern>/graphs/*</url-pattern>
- </servlet-mapping>-->
- <servlet>
- <servlet-name>ExoneraTor</servlet-name>
- <servlet-class>org.torproject.ernie.web.ExoneraTorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ExoneraTor</servlet-name>
- <url-pattern>/exonerator.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ServerDescriptor</servlet-name>
- <servlet-class>org.torproject.ernie.web.ServerDescriptorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServerDescriptor</servlet-name>
- <url-pattern>/serverdesc</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>Consensus</servlet-name>
- <servlet-class>org.torproject.ernie.web.ConsensusServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Consensus</servlet-name>
- <url-pattern>/consensus</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <servlet-class>org.torproject.ernie.web.ErnieGeneratedFileServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/log.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/papers/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/reports/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/consensus-health.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/consensus-health-1.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/consensus-health-2.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/csv/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/graphs/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/data/*</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>BridgeUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.BridgeUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>BridgeUsersGraphs</servlet-name>
- <url-pattern>/bridge-users-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ExitRelaysGraphsServlet</servlet-name>
- <servlet-class>org.torproject.ernie.web.ExitRelaysGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ExitRelaysGraphsServlet</servlet-name>
- <url-pattern>/exit-relays-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ConsensusGraphsServlet</servlet-name>
- <servlet-class>org.torproject.ernie.web.ConsensusGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ConsensusGraphsServlet</servlet-name>
- <url-pattern>/consensus-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>NewUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.NewUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>NewUsersGraphs</servlet-name>
- <url-pattern>/new-users-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>RecurringUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.RecurringUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RecurringUsersGraphs</servlet-name>
- <url-pattern>/recurring-users-graphs.html</url-pattern>
- </servlet-mapping>
-</web-app>
-
diff --git a/jsp/etc/build.properties b/jsp/etc/build.properties
new file mode 100644
index 0000000..6969e8d
--- /dev/null
+++ b/jsp/etc/build.properties
@@ -0,0 +1,12 @@
+# Ant properties for building and deploying the jsp section of the website
+
+appserver.home=/usr/local/tomcat
+# for Tomcat 5 use $appserver.home}/server/lib
+# for Tomcat 6 use $appserver.home}/lib
+appserver.lib=${appserver.home}/lib
+
+deploy.path=${appserver.home}/webapps
+
+tomcat.manager.url=http://localhost:8080/manager/html
+tomcat.manager.username=username
+tomcat.manager.password=password
diff --git a/jsp/war/WEB-INF/templates/footer.tpl.jsp b/jsp/war/WEB-INF/templates/footer.tpl.jsp
index ab29f8f..e527c1d 100644
--- a/jsp/war/WEB-INF/templates/footer.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/footer.tpl.jsp
@@ -1 +1,6 @@
-<p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
+ <p>This material is supported in part by the National Science
+ Foundation under Grant No. CNS-0959138. Any opinions,
+ finding, and conclusions or recommendations expressed in this
+ material are those of the author(s) and do not necessarily reflect
+ the views of the National Science Foundation.</p>
+ <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
diff --git a/jsp/war/WEB-INF/templates/graphs.tpl.jsp b/jsp/war/WEB-INF/templates/graphs.tpl.jsp
index f776506..7543b1d 100644
--- a/jsp/war/WEB-INF/templates/graphs.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs.tpl.jsp
@@ -1,117 +1,116 @@
-<div>
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <p>The graphs on this page visualize a small portion of the data
- gathered in the Tor Metrics Project. They are generated by a
- combination of shell scripts, Java applications, and R code (for
- details see the <a href="tools.html">Tools</a> section). The
- following graphs are available:</p>
- <ul>
- <li><a href="#relays">Relays in the Tor network</a></li>
- <li><a href="#newusers">New or returning, directly connecting
- Tor users</a></li>
- <li><a href="#recurringusers">Recurring, directly connecting Tor
- users</a></li>
- <li><a href="#bridgeusers">Tor users via bridges</a></li>
- <li><a href="#torperf">Time to complete requests</a></li>
- <li><a href="#gettor">Packages requested from GetTor</a></li>
- <li><a href="#versions">Relay versions</a></li>
- <li><a href="#platforms">Relay platforms</a></li>
- <li><a href="#bandwidth">Relay bandwidth</a></li>
- </ul>
- <br/>
- <a id="relays"/>
- <h3>Relays in the Tor network</h3>
- <br/>
- <p>The number of relays in the Tor network can be extracted from
- the hourly published network status consensuses.</p>
- <img src="graphs/networksize/networksize-30d.png"/>
- <p>Other graphs related to network size can be found on a
- <a href="consensus-graphs.html">separate page</a>.</p>
- <br/>
- <a id="newusers"/>
- <h3>New or returning, directly connecting Tor users</h3>
- <br/>
- <p>Users connecting to the Tor network for the first time request
- a list of running relays from one of currently seven directory
- authorities. Likewise, returning users whose network information is
- out of date connect to one of the directory authorities to
- download a fresh list of relays. The following graphs display an
- estimate of new or returning Tor users based on the requests as
- seen by gabelmoo, one of the directory authorities.</p>
- <img src="graphs/new-users/iran-new-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="new-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="recurringusers"/>
- <h3>Recurring, directly connecting Tor users</h3>
- <br/>
- <p>After being connected to the Tor network, users need to refresh
- their list of running relays on a regular basis. They send their
- requests to one out of a few hundred directory mirrors to save
- bandwidth of the directory authorities. The following graphs show
- an estimate of recurring Tor users based on the requests as seen
- by trusted, a particularly fast directory mirror.</p>
- <img src="graphs/direct-users/iran-direct-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="recurring-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="bridgeusers"/>
- <h3>Tor users via bridges</h3>
- <br/>
- <p>Users who cannot connect directly to the Tor network instead
- connect via bridges, which are non-public relays. The following
- graphs display an estimate of Tor users via bridges based on the
- unique IP addresses as seen by a few hundred bridges.</p>
- <img src="graphs/bridge-users/iran-bridges-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="bridge-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="torperf"/>
- <h3>Time to complete requests</h3>
- <br/>
- <p>The following graphs show the performance of the Tor network as
- experienced by its users. The graphs contain the average (median)
- time to request files of three different sizes over the network as
- well as first and third quartile of request times.</p>
- <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
- <p>Graphs for other file sizes or time intervals can be found on a
- <a href="torperf-graphs.html">separate page</a>.</p>
- <br/>
- <a id="gettor"/>
- <h3>Packages requested from GetTor</h3>
- <br/>
- <p>GetTor allows users to fetch Tor via email. The following
- graphs show the number of requested packages per day.</p>
- <img src="graphs/gettor/gettor-total.png"/>
- <p>More graphs about specific packages can be found on a
- <a href="gettor-graphs.html">separate page</a>.</p>
- <br/>
- <a id="versions"/>
- <h3>Relay versions</h3>
- <br/>
- <p>Relays report the Tor version that they are running in their
- server descriptors that they send to the directory authorities.
- The following graph shows the number of relays running specific
- Tor versions.</p>
- <img src="graphs/descriptors/versions.png"/>
- <br/>
- <a id="platforms"/>
- <h3>Relay platforms</h3>
- <br/>
- <p>Relays further report the operating systems in their server
- descriptors that they send to the directory authorities. The
- following graph shows the number of relays running specific
- platforms.</p>
- <img src="graphs/descriptors/platforms.png"/>
- <br/>
- <a id="bandwidth"/>
- <h3>Relay bandwidth</h3>
- <br/>
- <p>Relays advertise how much bandwidth they are willing and
- to contribute in their server descriptors. The following graph
- shows the sum of advertised bandwidth of all relays in the
- network.</p>
- <img src="graphs/descriptors/bandwidth.png"/>
- <br/>
-</div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <p>The graphs on this page visualize a small portion of the data
+ gathered in the Tor Metrics Project. They are generated by a
+ combination of shell scripts, Java applications, and R code (for
+ details see the <a href="tools.html">Tools</a> section). The
+ following graphs are available:</p>
+ <ul>
+ <li><a href="#relays">Relays in the Tor network</a></li>
+ <li><a href="#newusers">New or returning, directly connecting
+ Tor users</a></li>
+ <li><a href="#recurringusers">Recurring, directly connecting Tor
+ users</a></li>
+ <li><a href="#bridgeusers">Tor users via bridges</a></li>
+ <li><a href="#torperf">Time to complete requests</a></li>
+ <li><a href="#gettor">Packages requested from GetTor</a></li>
+ <li><a href="#versions">Relay versions</a></li>
+ <li><a href="#platforms">Relay platforms</a></li>
+ <li><a href="#bandwidth">Relay bandwidth</a></li>
+ </ul>
+ <br/>
+ <a id="relays"/>
+ <h3>Relays in the Tor network</h3>
+ <br/>
+ <p>The number of relays in the Tor network can be extracted from
+ the hourly published network status consensuses.</p>
+ <img src="graphs/networksize/networksize-30d.png"/>
+ <p>Other graphs related to <a href="consensus-graphs.html">network
+ size</a> and <a href="exit-relays-graphs.html">exit relays</a> can
+ be found on separate pages.</p>
+ <br/>
+ <a id="newusers"/>
+ <h3>New or returning, directly connecting Tor users</h3>
+ <br/>
+ <p>Users connecting to the Tor network for the first time request
+ a list of running relays from one of currently seven directory
+ authorities. Likewise, returning users whose network information
+ is out of date connect to one of the directory authorities to
+ download a fresh list of relays. The following graphs display an
+ estimate of new or returning Tor users based on the requests as
+ seen by gabelmoo, one of the directory authorities.</p>
+ <img src="graphs/new-users/iran-new-30d.png"/>
+ <p>Graphs for other countries can be found on a
+ <a href="new-users-graphs.html">separate page</a>.</p>
+ <br/>
+ <a id="recurringusers"/>
+ <h3>Recurring, directly connecting Tor users</h3>
+ <br/>
+ <p>After being connected to the Tor network, users need to refresh
+ their list of running relays on a regular basis. They send their
+ requests to one out of a few hundred directory mirrors to save
+ bandwidth of the directory authorities. The following graphs show
+ an estimate of recurring Tor users based on the requests as seen
+ by trusted, a particularly fast directory mirror.</p>
+ <img src="graphs/direct-users/iran-direct-30d.png"/>
+ <p>Graphs for other countries can be found on a
+ <a href="recurring-users-graphs.html">separate page</a>.</p>
+ <br/>
+ <a id="bridgeusers"/>
+ <h3>Tor users via bridges</h3>
+ <br/>
+ <p>Users who cannot connect directly to the Tor network instead
+ connect via bridges, which are non-public relays. The following
+ graphs display an estimate of Tor users via bridges based on the
+ unique IP addresses as seen by a few hundred bridges.</p>
+ <img src="graphs/bridge-users/iran-bridges-30d.png"/>
+ <p>Graphs for other countries can be found on a
+ <a href="bridge-users-graphs.html">separate page</a>.</p>
+ <br/>
+ <a id="torperf"/>
+ <h3>Time to complete requests</h3>
+ <br/>
+ <p>The following graphs show the performance of the Tor network as
+ experienced by its users. The graphs contain the average (median)
+ time to request files of three different sizes over the network as
+ well as first and third quartile of request times.</p>
+ <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
+ <p>Graphs for other file sizes or time intervals can be found on a
+ <a href="torperf-graphs.html">separate page</a>.</p>
+ <br/>
+ <a id="gettor"/>
+ <h3>Packages requested from GetTor</h3>
+ <br/>
+ <p>GetTor allows users to fetch Tor via email. The following
+ graphs show the number of requested packages per day.</p>
+ <img src="graphs/gettor/gettor-total.png"/>
+ <p>More graphs about specific packages can be found on a
+ <a href="gettor-graphs.html">separate page</a>.</p>
+ <br/>
+ <a id="versions"/>
+ <h3>Relay versions</h3>
+ <br/>
+ <p>Relays report the Tor version that they are running in their
+ server descriptors that they send to the directory authorities.
+ The following graph shows the number of relays running specific
+ Tor versions.</p>
+ <img src="graphs/descriptors/versions.png"/>
+ <br/>
+ <a id="platforms"/>
+ <h3>Relay platforms</h3>
+ <br/>
+ <p>Relays further report the operating systems in their server
+ descriptors that they send to the directory authorities. The
+ following graph shows the number of relays running specific
+ platforms.</p>
+ <img src="graphs/descriptors/platforms.png"/>
+ <br/>
+ <a id="bandwidth"/>
+ <h3>Relay bandwidth</h3>
+ <br/>
+ <p>Relays advertise how much bandwidth they are willing and
+ to contribute in their server descriptors. The following graph
+ shows the sum of advertised bandwidth of all relays in the
+ network.</p>
+ <img src="graphs/descriptors/bandwidth.png"/>
+ <br/>
diff --git a/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
index 724d3c8..0c453bd 100644
--- a/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
@@ -1,41 +1,39 @@
<%@page import="java.io.*" %>
<%@page import="java.util.*" %>
-<div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Tor users via bridges</h3>
+ <br/>
+ <p>Users who cannot connect directly to the Tor network instead
+ connect via bridges, which are non-public relays. The following
+ graphs display an estimate of Tor users via bridges based on the
+ unique IP addresses as seen by a few hundred bridges.</p>
+ <ul>
+ <li><a href=\"#bahrain\">Bahrain</a></li>
+ <li><a href=\"#china\">China</a></li>
+ <li><a href=\"#cuba\">Cuba</a></li>
+ <li><a href=\"#ethiopia\">Ethiopia</a></li>
+ <li><a href=\"#iran\">Iran</a></li>
+ <li><a href=\"#burma\">Burma</a></li>
+ <li><a href=\"#saudi\">Saudi</a></li>
+ <li><a href=\"#syria\">Syria</a></li>
+ <li><a href=\"#tunisia\">Tunisia</a></li>
+ <li><a href=\"#turkmenistan\">Turkmenistan</a></li>
+ <li><a href=\"#uzbekistan\">Uzbekistan</a></li>
+ <li><a href=\"#vietnam\">Vietnam</a></li>
+ <li><a href=\"#yemen\">Yemen</a></li>
+ </ul>
+ <ul>
+ <li><a href=\"csv/bridge-users.csv\">CSV</a> file containing all
+ data.</li>
+ <li><a href=\"csv/monthly-users-peak.csv\">CSV</a> file
+ containing peak daily Tor users (recurring and bridge) per month
+ by country.</li>
+ <li><a href=\"csv/monthly-users-average.csv\">CSV</a> file
+ containing average daily Tor users (recurring and bridge) per
+ month by country.</li>
+ </ul>
<%
- out.print( " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Tor users via bridges</h3>\n"
- + " <br/>\n"
- + " <p>Users who cannot connect directly to the Tor network instead\n"
- + " connect via bridges, which are non-public relays. The following\n"
- + " graphs display an estimate of Tor users via bridges based on the\n"
- + " unique IP addresses as seen by a few hundred bridges.</p>\n"
- + " <ul>\n"
- + " <li><a href=\"#bahrain\">Bahrain</a></li>\n"
- + " <li><a href=\"#china\">China</a></li>\n"
- + " <li><a href=\"#cuba\">Cuba</a></li>\n"
- + " <li><a href=\"#ethiopia\">Ethiopia</a></li>\n"
- + " <li><a href=\"#iran\">Iran</a></li>\n"
- + " <li><a href=\"#burma\">Burma</a></li>\n"
- + " <li><a href=\"#saudi\">Saudi</a></li>\n"
- + " <li><a href=\"#syria\">Syria</a></li>\n"
- + " <li><a href=\"#tunisia\">Tunisia</a></li>\n"
- + " <li><a href=\"#turkmenistan\">Turkmenistan</a></li>\n"
- + " <li><a href=\"#uzbekistan\">Uzbekistan</a></li>\n"
- + " <li><a href=\"#vietnam\">Vietnam</a></li>\n"
- + " <li><a href=\"#yemen\">Yemen</a></li>\n"
- + " </ul>\n"
- + " <ul>\n"
- + " <li><a href=\"csv/bridge-users.csv\">CSV</a> file containing all\n"
- + " data.</li>\n"
- + " <li><a href=\"csv/monthly-users-peak.csv\">CSV</a> "
- + "file containing peak daily Tor users (recurring and bridge) "
- + "per month by country.</li>\n"
- + " <li><a href=\"csv/monthly-users-average.csv\">"
- + "CSV</a> file containing average daily Tor users (recurring "
- + "and bridge) per month by country.</li>\n"
- + " </ul>"
- + " ");
List<String> countries = Arrays.asList((
"bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
+ "turkmenistan,uzbekistan,vietnam,yemen").split(","));
@@ -56,4 +54,3 @@
}
out.print("<br/>\n");
%>
-</div>
diff --git a/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
index 98474b0..75e7283 100644
--- a/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
@@ -1,26 +1,25 @@
<%@page import="java.io.*" %>
<%@page import="java.util.*" %>
-<div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Exit relays in the Tor network</h3>
+ <br/>
+ <p>The number of exit relays in the Tor network can be extracted from
+ the hourly published network status consensuses.</p>
+ <ul>
+ <li>Past <a href=\"#exit-72h\">72 hours</a> up to
+ now</li>
+ <li>Past <a href=\"#exit-30d\">30</a>,
+ <a href=\"#exit-90d\">90</a>,
+ <a href=\"#exit-180d\">180</a> days</li>
+ <li><a href=\"#exit-all\">All data</a> up to today</li>
<%
- out.print( " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Exit relays in the Tor network</h3>\n"
- + " <br/>\n"
- + " <p>The number of exit relays in the Tor network can be extracted from\n"
- + " the hourly published network status consensuses.</p>\n"
- + " <ul>\n"
- + " <li>Past <a href=\"#exit-72h\">72 hours</a> up to\n"
- + " now</li>\n"
- + " <li>Past <a href=\"#exit-30d\">30</a>,\n"
- + " <a href=\"#exit-90d\">90</a>,\n"
- + " <a href=\"#exit-180d\">180</a> days</li>\n"
- + " <li><a href=\"#exit-all\">All data</a> up to today</li>\n"
- + " <li>Annual graphs of\n");
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
lastQuarter.add(Calendar.MONTH, -3);
Calendar lastMonth = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
lastMonth.add(Calendar.MONTH, -1);
+ out.print(" <li>Annual graphs of\n");
for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
out.print(" <a href=\"#exit-" + i + "\">"
+ i + "</a>,\n");
@@ -56,4 +55,3 @@
out.print(String.format(" </p><p><a id=\"exit-%1$tY-%1$tm\"/><img src=\"graphs/exit/exit-%1$tY-%1$tm.png\"/>\n", lastMonth));
out.print(" </p><br/>\n");
%>
-</div>
diff --git a/jsp/war/WEB-INF/templates/graphs_gettor.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_gettor.tpl.jsp
index 1abb2b7..0d03363 100644
--- a/jsp/war/WEB-INF/templates/graphs_gettor.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_gettor.tpl.jsp
@@ -1,14 +1,12 @@
-<div>
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>Packages requested from GetTor</h3>
- <br/>
- <p>GetTor allows users to fetch Tor via email. The following
- graphs show the number of requested packages per day.</p>
- <p><a href="csv/gettor.csv">CSV</a> file containing all data.</p>
- <img src="graphs/gettor/gettor-total.png"/>
- <img src="graphs/gettor/gettor-en.png"/>
- <img src="graphs/gettor/gettor-zh_cn.png"/>
- <img src="graphs/gettor/gettor-fa.png"/>
- <br/>
-</div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Packages requested from GetTor</h3>
+ <br/>
+ <p>GetTor allows users to fetch Tor via email. The following
+ graphs show the number of requested packages per day.</p>
+ <p><a href="csv/gettor.csv">CSV</a> file containing all data.</p>
+ <img src="graphs/gettor/gettor-total.png"/>
+ <img src="graphs/gettor/gettor-en.png"/>
+ <img src="graphs/gettor/gettor-zh_cn.png"/>
+ <img src="graphs/gettor/gettor-fa.png"/>
+ <br/>
diff --git a/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
index 9c88a2b..825bf2e 100644
--- a/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
@@ -1,24 +1,24 @@
<%@page import="java.util.*" %>
<%@page import="java.io.*" %>
-<div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Relays and bridges in the Tor network</h3>
+ <br/>
+ <p>The number of relays and bridges in the Tor network can be
+ extracted from the hourly published network status consensuses
+ and sanitized bridge statuses.</p>
+ <ul>
+ <li>Past <a href=\"#networksize-30d\">30</a>,
+ <a href=\"#networksize-90d\">90</a>,
+ <a href=\"#networksize-180d\">180</a> days</li>
+ <li><a href=\"#networksize-all\">All data</a> up to today</li>
<%
- out.print(" <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Relays and bridges in the Tor network</h3>\n"
- + " <br/>\n"
- + " <p>The number of relays and bridges in the Tor network can be extracted from\n"
- + " the hourly published network status consensuses and sanitized bridge statuses.</p>\n"
- + " <ul>\n"
- + " <li>Past <a href=\"#networksize-30d\">30</a>,\n"
- + " <a href=\"#networksize-90d\">90</a>,\n"
- + " <a href=\"#networksize-180d\">180</a> days</li>\n"
- + " <li><a href=\"#networksize-all\">All data</a> up to today</li>\n"
- + " <li>Annual graphs of\n");
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
lastQuarter.add(Calendar.MONTH, -3);
Calendar lastMonth = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
lastMonth.add(Calendar.MONTH, -1);
+ out.print(" <li>Annual graphs of\n");
for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
out.print(" <a href=\"#networksize-" + i + "\">"
+ i + "</a>,\n");
@@ -63,4 +63,3 @@
+ " <img src=\"graphs/networksize/networksize-%1$tY-%1$tm.png\"/>\n", lastMonth));
out.print(" </p><br/>\n");
%>
-</div>
diff --git a/jsp/war/WEB-INF/templates/graphs_new-users.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_new-users.tpl.jsp
index 61a519f..b0fcf04 100644
--- a/jsp/war/WEB-INF/templates/graphs_new-users.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_new-users.tpl.jsp
@@ -1,137 +1,50 @@
-<div>
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>New or returning, directly connecting Tor users</h3>
- <br/>
- <p>Users connecting to the Tor network for the first time request
- a list of running relays from one of currently seven directory
- authorities. Likewise, returning users whose network information is
- out of date connect to one of the directory authorities to
- download a fresh list of relays. The following graphs display an
- estimate of new or returning Tor users based on the requests as
- seen by gabelmoo, one of the directory authorities.</p>
- <ul>
- <li><a href="#bahrain">Bahrain</a></li>
- <li><a href="#china">China</a></li>
- <li><a href="#cuba">Cuba</a></li>
- <li><a href="#ethiopia">Ethiopia</a></li>
- <li><a href="#iran">Iran</a></li>
- <li><a href="#burma">Burma</a></li>
- <li><a href="#saudi">Saudi</a></li>
- <li><a href="#syria">Syria</a></li>
- <li><a href="#tunisia">Tunisia</a></li>
- <li><a href="#turkmenistan">Turkmenistan</a></li>
- <li><a href="#uzbekistan">Uzbekistan</a></li>
- <li><a href="#vietnam">Vietnam</a></li>
- <li><a href="#yemen">Yemen</a></li>
- </ul>
- <ul>
- <li><a href="csv/new-users.csv">CSV</a> file containing all
- data.</li>
- </ul>
- <p><a id="bahrain"/>
- <img src="graphs/new-users/bahrain-new-30d.png"/>
- <img src="graphs/new-users/bahrain-new-90d.png"/>
- <img src="graphs/new-users/bahrain-new-180d.png"/>
- <img src="graphs/new-users/bahrain-new-all.png"/>
- <img src="graphs/new-users/bahrain-new-2010.png"/>
- <img src="graphs/new-users/bahrain-new-2010-q2.png"/>
- <img src="graphs/new-users/bahrain-new-2010-06.png"/>
- </p><p><a id="china"/>
- <img src="graphs/new-users/china-new-30d.png"/>
- <img src="graphs/new-users/china-new-90d.png"/>
- <img src="graphs/new-users/china-new-180d.png"/>
- <img src="graphs/new-users/china-new-all.png"/>
- <img src="graphs/new-users/china-new-2010.png"/>
- <img src="graphs/new-users/china-new-2010-q2.png"/>
- <img src="graphs/new-users/china-new-2010-06.png"/>
- </p><p><a id="cuba"/>
- <img src="graphs/new-users/cuba-new-30d.png"/>
- <img src="graphs/new-users/cuba-new-90d.png"/>
- <img src="graphs/new-users/cuba-new-180d.png"/>
- <img src="graphs/new-users/cuba-new-all.png"/>
- <img src="graphs/new-users/cuba-new-2010.png"/>
- <img src="graphs/new-users/cuba-new-2010-q2.png"/>
- <img src="graphs/new-users/cuba-new-2010-06.png"/>
- </p><p><a id="ethiopia"/>
- <img src="graphs/new-users/ethiopia-new-30d.png"/>
- <img src="graphs/new-users/ethiopia-new-90d.png"/>
- <img src="graphs/new-users/ethiopia-new-180d.png"/>
- <img src="graphs/new-users/ethiopia-new-all.png"/>
- <img src="graphs/new-users/ethiopia-new-2010.png"/>
- <img src="graphs/new-users/ethiopia-new-2010-q2.png"/>
- <img src="graphs/new-users/ethiopia-new-2010-06.png"/>
- </p><p><a id="iran"/>
- <img src="graphs/new-users/iran-new-30d.png"/>
- <img src="graphs/new-users/iran-new-90d.png"/>
- <img src="graphs/new-users/iran-new-180d.png"/>
- <img src="graphs/new-users/iran-new-all.png"/>
- <img src="graphs/new-users/iran-new-2010.png"/>
- <img src="graphs/new-users/iran-new-2010-q2.png"/>
- <img src="graphs/new-users/iran-new-2010-06.png"/>
- </p><p><a id="burma"/>
- <img src="graphs/new-users/burma-new-30d.png"/>
- <img src="graphs/new-users/burma-new-90d.png"/>
- <img src="graphs/new-users/burma-new-180d.png"/>
- <img src="graphs/new-users/burma-new-all.png"/>
- <img src="graphs/new-users/burma-new-2010.png"/>
- <img src="graphs/new-users/burma-new-2010-q2.png"/>
- <img src="graphs/new-users/burma-new-2010-06.png"/>
- </p><p><a id="saudi"/>
- <img src="graphs/new-users/saudi-new-30d.png"/>
- <img src="graphs/new-users/saudi-new-90d.png"/>
- <img src="graphs/new-users/saudi-new-180d.png"/>
- <img src="graphs/new-users/saudi-new-all.png"/>
- <img src="graphs/new-users/saudi-new-2010.png"/>
- <img src="graphs/new-users/saudi-new-2010-q2.png"/>
- <img src="graphs/new-users/saudi-new-2010-06.png"/>
- </p><p><a id="syria"/>
- <img src="graphs/new-users/syria-new-30d.png"/>
- <img src="graphs/new-users/syria-new-90d.png"/>
- <img src="graphs/new-users/syria-new-180d.png"/>
- <img src="graphs/new-users/syria-new-all.png"/>
- <img src="graphs/new-users/syria-new-2010.png"/>
- <img src="graphs/new-users/syria-new-2010-q2.png"/>
- <img src="graphs/new-users/syria-new-2010-06.png"/>
- </p><p><a id="tunisia"/>
- <img src="graphs/new-users/tunisia-new-30d.png"/>
- <img src="graphs/new-users/tunisia-new-90d.png"/>
- <img src="graphs/new-users/tunisia-new-180d.png"/>
- <img src="graphs/new-users/tunisia-new-all.png"/>
- <img src="graphs/new-users/tunisia-new-2010.png"/>
- <img src="graphs/new-users/tunisia-new-2010-q2.png"/>
- <img src="graphs/new-users/tunisia-new-2010-06.png"/>
- </p><p><a id="turkmenistan"/>
- <img src="graphs/new-users/turkmenistan-new-30d.png"/>
- <img src="graphs/new-users/turkmenistan-new-90d.png"/>
- <img src="graphs/new-users/turkmenistan-new-180d.png"/>
- <img src="graphs/new-users/turkmenistan-new-all.png"/>
- <img src="graphs/new-users/turkmenistan-new-2010.png"/>
- <img src="graphs/new-users/turkmenistan-new-2010-q2.png"/>
- <img src="graphs/new-users/turkmenistan-new-2010-06.png"/>
- </p><p><a id="uzbekistan"/>
- <img src="graphs/new-users/uzbekistan-new-30d.png"/>
- <img src="graphs/new-users/uzbekistan-new-90d.png"/>
- <img src="graphs/new-users/uzbekistan-new-180d.png"/>
- <img src="graphs/new-users/uzbekistan-new-all.png"/>
- <img src="graphs/new-users/uzbekistan-new-2010.png"/>
- <img src="graphs/new-users/uzbekistan-new-2010-q2.png"/>
- <img src="graphs/new-users/uzbekistan-new-2010-06.png"/>
- </p><p><a id="vietnam"/>
- <img src="graphs/new-users/vietnam-new-30d.png"/>
- <img src="graphs/new-users/vietnam-new-90d.png"/>
- <img src="graphs/new-users/vietnam-new-180d.png"/>
- <img src="graphs/new-users/vietnam-new-all.png"/>
- <img src="graphs/new-users/vietnam-new-2010.png"/>
- <img src="graphs/new-users/vietnam-new-2010-q2.png"/>
- <img src="graphs/new-users/vietnam-new-2010-06.png"/>
- </p><p><a id="yemen"/>
- <img src="graphs/new-users/yemen-new-30d.png"/>
- <img src="graphs/new-users/yemen-new-90d.png"/>
- <img src="graphs/new-users/yemen-new-180d.png"/>
- <img src="graphs/new-users/yemen-new-all.png"/>
- <img src="graphs/new-users/yemen-new-2010.png"/>
- <img src="graphs/new-users/yemen-new-2010-q2.png"/>
- <img src="graphs/new-users/yemen-new-2010-06.png"/>
- </p><br/>
- </div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>New or returning, directly connecting Tor users</h3>
+ <br/>
+ <p>Users connecting to the Tor network for the first time request
+ a list of running relays from one of currently seven directory
+ authorities. Likewise, returning users whose network information is
+ out of date connect to one of the directory authorities to
+ download a fresh list of relays. The following graphs display an
+ estimate of new or returning Tor users based on the requests as
+ seen by gabelmoo, one of the directory authorities.</p>
+ <ul>
+ <li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#china">China</a></li>
+ <li><a href="#cuba">Cuba</a></li>
+ <li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#iran">Iran</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#saudi">Saudi</a></li>
+ <li><a href="#syria">Syria</a></li>
+ <li><a href="#tunisia">Tunisia</a></li>
+ <li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uzbekistan">Uzbekistan</a></li>
+ <li><a href="#vietnam">Vietnam</a></li>
+ <li><a href="#yemen">Yemen</a></li>
+ </ul>
+ <ul>
+ <li><a href="csv/new-users.csv">CSV</a> file containing all
+ data.</li>
+ </ul>
+<%
+ List<String> countries = Arrays.asList((
+ "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
+ + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
+ List<String> suffixes = new ArrayList<String>(Arrays.asList(
+ "30d,90d,180d,all".split(",")));
+ Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ suffixes.add(String.format("%tY", now));
+ suffixes.add(String.format("%1$tY-q%2$d", now,
+ 1 + now.get(Calendar.MONTH) / 3));
+ suffixes.add(String.format("%1$tY-%1$tm", now));
+ for (String country : countries) {
+ out.print(" <p><a id=\"" + country + "\"/>\n");
+ for (String suffix : suffixes) {
+ out.print(" <img src=\"graphs/new-users/" + country
+ + "-new-" + suffix + ".png\"/>\n");
+ }
+ out.print(" </p>");
+%>
+ <br/>
diff --git a/jsp/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
index dac5681..73c49bd 100644
--- a/jsp/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
@@ -1,138 +1,56 @@
-<div>
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>Recurring, directly connecting Tor users</h3>
- <br/>
- <p>After being connected to the Tor network, users need to refresh
- their list of running relays on a regular basis. They send their
- requests to one out of a few hundred directory mirrors to save
- bandwidth of the directory authorities. The following graphs show
- an estimate of recurring Tor users based on the requests as seen
- by trusted, a particularly fast directory mirror.</p>
- <ul>
- <li><a href="#bahrain">Bahrain</a></li>
- <li><a href="#china">China</a></li>
- <li><a href="#cuba">Cuba</a></li>
- <li><a href="#ethiopia">Ethiopia</a></li>
- <li><a href="#iran">Iran</a></li>
- <li><a href="#burma">Burma</a></li>
- <li><a href="#saudi">Saudi</a></li>
- <li><a href="#syria">Syria</a></li>
- <li><a href="#tunisia">Tunisia</a></li>
- <li><a href="#turkmenistan">Turkmenistan</a></li>
- <li><a href="#uzbekistan">Uzbekistan</a></li>
- <li><a href="#vietnam">Vietnam</a></li>
- <li><a href="#yemen">Yemen</a></li>
- </ul>
- <ul>
- <li><a href="csv/recurring-users.csv">CSV</a> file containing
- all data.</li>
- <li><a href="csv/monthly-users-peak.csv">CSV</a> file containing peak daily Tor users (recurring and bridge) per month by country.</li>
- <li><a href="csv/monthly-users-average.csv">CSV</a> file containing average daily Tor users (recurring and bridge) per month by country.</li>
- </ul>
- <p><a id="bahrain"/>
- <img src="graphs/direct-users/bahrain-direct-30d.png"/>
- <img src="graphs/direct-users/bahrain-direct-90d.png"/>
- <img src="graphs/direct-users/bahrain-direct-180d.png"/>
- <img src="graphs/direct-users/bahrain-direct-all.png"/>
- <img src="graphs/direct-users/bahrain-direct-2010.png"/>
- <img src="graphs/direct-users/bahrain-direct-2010-q2.png"/>
- <img src="graphs/direct-users/bahrain-direct-2010-06.png"/>
- </p><p><a id="china"/>
- <img src="graphs/direct-users/china-direct-30d.png"/>
- <img src="graphs/direct-users/china-direct-90d.png"/>
- <img src="graphs/direct-users/china-direct-180d.png"/>
- <img src="graphs/direct-users/china-direct-all.png"/>
- <img src="graphs/direct-users/china-direct-2010.png"/>
- <img src="graphs/direct-users/china-direct-2010-q2.png"/>
- <img src="graphs/direct-users/china-direct-2010-06.png"/>
- </p><p><a id="cuba"/>
- <img src="graphs/direct-users/cuba-direct-30d.png"/>
- <img src="graphs/direct-users/cuba-direct-90d.png"/>
- <img src="graphs/direct-users/cuba-direct-180d.png"/>
- <img src="graphs/direct-users/cuba-direct-all.png"/>
- <img src="graphs/direct-users/cuba-direct-2010.png"/>
- <img src="graphs/direct-users/cuba-direct-2010-q2.png"/>
- <img src="graphs/direct-users/cuba-direct-2010-06.png"/>
- </p><p><a id="ethiopia"/>
- <img src="graphs/direct-users/ethiopia-direct-30d.png"/>
- <img src="graphs/direct-users/ethiopia-direct-90d.png"/>
- <img src="graphs/direct-users/ethiopia-direct-180d.png"/>
- <img src="graphs/direct-users/ethiopia-direct-all.png"/>
- <img src="graphs/direct-users/ethiopia-direct-2010.png"/>
- <img src="graphs/direct-users/ethiopia-direct-2010-q2.png"/>
- <img src="graphs/direct-users/ethiopia-direct-2010-06.png"/>
- </p><p><a id="iran"/>
- <img src="graphs/direct-users/iran-direct-30d.png"/>
- <img src="graphs/direct-users/iran-direct-90d.png"/>
- <img src="graphs/direct-users/iran-direct-180d.png"/>
- <img src="graphs/direct-users/iran-direct-all.png"/>
- <img src="graphs/direct-users/iran-direct-2010.png"/>
- <img src="graphs/direct-users/iran-direct-2010-q2.png"/>
- <img src="graphs/direct-users/iran-direct-2010-06.png"/>
- </p><p><a id="burma"/>
- <img src="graphs/direct-users/burma-direct-30d.png"/>
- <img src="graphs/direct-users/burma-direct-90d.png"/>
- <img src="graphs/direct-users/burma-direct-180d.png"/>
- <img src="graphs/direct-users/burma-direct-all.png"/>
- <img src="graphs/direct-users/burma-direct-2010.png"/>
- <img src="graphs/direct-users/burma-direct-2010-q2.png"/>
- <img src="graphs/direct-users/burma-direct-2010-06.png"/>
- </p><p><a id="saudi"/>
- <img src="graphs/direct-users/saudi-direct-30d.png"/>
- <img src="graphs/direct-users/saudi-direct-90d.png"/>
- <img src="graphs/direct-users/saudi-direct-180d.png"/>
- <img src="graphs/direct-users/saudi-direct-all.png"/>
- <img src="graphs/direct-users/saudi-direct-2010.png"/>
- <img src="graphs/direct-users/saudi-direct-2010-q2.png"/>
- <img src="graphs/direct-users/saudi-direct-2010-06.png"/>
- </p><p><a id="syria"/>
- <img src="graphs/direct-users/syria-direct-30d.png"/>
- <img src="graphs/direct-users/syria-direct-90d.png"/>
- <img src="graphs/direct-users/syria-direct-180d.png"/>
- <img src="graphs/direct-users/syria-direct-all.png"/>
- <img src="graphs/direct-users/syria-direct-2010.png"/>
- <img src="graphs/direct-users/syria-direct-2010-q2.png"/>
- <img src="graphs/direct-users/syria-direct-2010-06.png"/>
- </p><p><a id="tunisia"/>
- <img src="graphs/direct-users/tunisia-direct-30d.png"/>
- <img src="graphs/direct-users/tunisia-direct-90d.png"/>
- <img src="graphs/direct-users/tunisia-direct-180d.png"/>
- <img src="graphs/direct-users/tunisia-direct-all.png"/>
- <img src="graphs/direct-users/tunisia-direct-2010.png"/>
- <img src="graphs/direct-users/tunisia-direct-2010-q2.png"/>
- <img src="graphs/direct-users/tunisia-direct-2010-06.png"/>
- </p><p><a id="turkmenistan"/>
- <img src="graphs/direct-users/turkmenistan-direct-30d.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-90d.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-180d.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-all.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-2010.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-2010-q2.png"/>
- <img src="graphs/direct-users/turkmenistan-direct-2010-06.png"/>
- </p><p><a id="uzbekistan"/>
- <img src="graphs/direct-users/uzbekistan-direct-30d.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-90d.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-180d.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-all.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-2010.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-2010-q2.png"/>
- <img src="graphs/direct-users/uzbekistan-direct-2010-06.png"/>
- </p><p><a id="vietnam"/>
- <img src="graphs/direct-users/vietnam-direct-30d.png"/>
- <img src="graphs/direct-users/vietnam-direct-90d.png"/>
- <img src="graphs/direct-users/vietnam-direct-180d.png"/>
- <img src="graphs/direct-users/vietnam-direct-all.png"/>
- <img src="graphs/direct-users/vietnam-direct-2010.png"/>
- <img src="graphs/direct-users/vietnam-direct-2010-q2.png"/>
- <img src="graphs/direct-users/vietnam-direct-2010-06.png"/>
- </p><p><a id="yemen"/>
- <img src="graphs/direct-users/yemen-direct-30d.png"/>
- <img src="graphs/direct-users/yemen-direct-90d.png"/>
- <img src="graphs/direct-users/yemen-direct-180d.png"/>
- <img src="graphs/direct-users/yemen-direct-all.png"/>
- <img src="graphs/direct-users/yemen-direct-2010.png"/>
- <img src="graphs/direct-users/yemen-direct-2010-q2.png"/>
- <img src="graphs/direct-users/yemen-direct-2010-06.png"/>
- </p><br/>
- </div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Recurring, directly connecting Tor users</h3>
+ <br/>
+ <p>After being connected to the Tor network, users need to refresh
+ their list of running relays on a regular basis. They send their
+ requests to one out of a few hundred directory mirrors to save
+ bandwidth of the directory authorities. The following graphs show
+ an estimate of recurring Tor users based on the requests as seen
+ by trusted, a particularly fast directory mirror.</p>
+ <ul>
+ <li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#china">China</a></li>
+ <li><a href="#cuba">Cuba</a></li>
+ <li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#iran">Iran</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#saudi">Saudi</a></li>
+ <li><a href="#syria">Syria</a></li>
+ <li><a href="#tunisia">Tunisia</a></li>
+ <li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uzbekistan">Uzbekistan</a></li>
+ <li><a href="#vietnam">Vietnam</a></li>
+ <li><a href="#yemen">Yemen</a></li>
+ </ul>
+ <ul>
+ <li><a href="csv/recurring-users.csv">CSV</a> file containing
+ all data.</li>
+ <li><a href="csv/monthly-users-peak.csv">CSV</a> file containing
+ peak daily Tor users (recurring and bridge) per month by
+ country.</li>
+ <li><a href="csv/monthly-users-average.csv">CSV</a> file
+ containing average daily Tor users (recurring and bridge) per
+ month by country.</li>
+ </ul>
+<%
+ List<String> countries = Arrays.asList((
+ "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
+ + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
+ List<String> suffixes = new ArrayList<String>(Arrays.asList(
+ "30d,90d,180d,all".split(",")));
+ Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ suffixes.add(String.format("%tY", now));
+ suffixes.add(String.format("%1$tY-q%2$d", now,
+ 1 + now.get(Calendar.MONTH) / 3));
+ suffixes.add(String.format("%1$tY-%1$tm", now));
+ for (String country : countries) {
+ out.print(" <p><a id=\"" + country + "\"/>\n");
+ for (String suffix : suffixes) {
+ out.print(" <img src=\"graphs/direct-users/" + country
+ + "-direct-" + suffix + ".png\"/>\n");
+ }
+ out.print(" </p>\n");
+ }
+%>
+ <br/>
diff --git a/jsp/war/WEB-INF/templates/graphs_torperf.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_torperf.tpl.jsp
index 24e197a..f617240 100644
--- a/jsp/war/WEB-INF/templates/graphs_torperf.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_torperf.tpl.jsp
@@ -1,39 +1,37 @@
-<div>
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>Time to complete requests</h3>
- <br/>
- <p>The following graphs show the performance of the Tor network as
- experienced by its users. The graphs contain the average (median)
- time to request files of three different sizes over the network as
- well as first and third quartile of request times.</p>
- <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p>
- <img src="graphs/torperf/torperf-50kb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-2w.png"/>
- <br/>
-</div>
+ <h2>Tor Metrics Portal: Graphs</h2>
+ <br/>
+ <h3>Time to complete requests</h3>
+ <br/>
+ <p>The following graphs show the performance of the Tor network as
+ experienced by its users. The graphs contain the average (median)
+ time to request files of three different sizes over the network as
+ well as first and third quartile of request times.</p>
+ <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p>
+ <img src="graphs/torperf/torperf-50kb-torperf-12m.png"/>
+ <img src="graphs/torperf/torperf-50kb-moria-12m.png"/>
+ <img src="graphs/torperf/torperf-50kb-siv-12m.png"/>
+ <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
+ <img src="graphs/torperf/torperf-50kb-moria-6m.png"/>
+ <img src="graphs/torperf/torperf-50kb-siv-6m.png"/>
+ <img src="graphs/torperf/torperf-50kb-torperf-2w.png"/>
+ <img src="graphs/torperf/torperf-50kb-moria-2w.png"/>
+ <img src="graphs/torperf/torperf-50kb-siv-2w.png"/>
+ <img src="graphs/torperf/torperf-1mb-torperf-12m.png"/>
+ <img src="graphs/torperf/torperf-1mb-moria-12m.png"/>
+ <img src="graphs/torperf/torperf-1mb-siv-12m.png"/>
+ <img src="graphs/torperf/torperf-1mb-torperf-6m.png"/>
+ <img src="graphs/torperf/torperf-1mb-moria-6m.png"/>
+ <img src="graphs/torperf/torperf-1mb-siv-6m.png"/>
+ <img src="graphs/torperf/torperf-1mb-torperf-2w.png"/>
+ <img src="graphs/torperf/torperf-1mb-moria-2w.png"/>
+ <img src="graphs/torperf/torperf-1mb-siv-2w.png"/>
+ <img src="graphs/torperf/torperf-5mb-torperf-12m.png"/>
+ <img src="graphs/torperf/torperf-5mb-moria-12m.png"/>
+ <img src="graphs/torperf/torperf-5mb-siv-12m.png"/>
+ <img src="graphs/torperf/torperf-5mb-torperf-6m.png"/>
+ <img src="graphs/torperf/torperf-5mb-moria-6m.png"/>
+ <img src="graphs/torperf/torperf-5mb-siv-6m.png"/>
+ <img src="graphs/torperf/torperf-5mb-torperf-2w.png"/>
+ <img src="graphs/torperf/torperf-5mb-moria-2w.png"/>
+ <img src="graphs/torperf/torperf-5mb-siv-2w.png"/>
+ <br/>
diff --git a/jsp/war/WEB-INF/templates/index.tpl.jsp b/jsp/war/WEB-INF/templates/index.tpl.jsp
index 3a9c06c..22c0211 100644
--- a/jsp/war/WEB-INF/templates/index.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/index.tpl.jsp
@@ -1,4 +1,3 @@
-<div>
<h2>Tor Metrics Portal</h2>
<br/>
<p>The Tor Metrics Portal aggregates all kinds of interesting
@@ -60,4 +59,3 @@
<a href="csv/monthly-users-average.csv">average</a>
daily users per month by country.</li>
</ul>
-</div>
diff --git a/jsp/war/WEB-INF/templates/main.tpl.jsp b/jsp/war/WEB-INF/templates/main.tpl.jsp
index cb8d258..33dadc7 100644
--- a/jsp/war/WEB-INF/templates/main.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/main.tpl.jsp
@@ -1,23 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title><jsp:getProperty name="template" property="title"/></title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="/css/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="/images/favicon.ico" type=image/x-icon rel="shortcut icon">
+ <title><jsp:getProperty name="template" property="title"/></title>
+ <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+ <link href="/css/stylesheet-ltr.css" type=text/css rel=stylesheet>
+ <link href="/images/favicon.ico" type=image/x-icon rel="shortcut icon">
</head>
<body>
<div class="center">
- <%--@ include file="/WEB-INF/templates/banner.tpl.jsp" --%>
<jsp:include page='/WEB-INF/templates/banner.tpl.jsp' />
<div class="main-column">
<jsp:include page='<%=template.getTemplate()%>' />
</div>
- </div>
- <div class="bottom" id="bottom">
- <%--@ include file="/WEB-INF/templates/footer.tpl.jsp" --%>
- <jsp:include page='/WEB-INF/templates/footer.tpl.jsp' />
- </div>
+ </div>
+ <div class="bottom" id="bottom">
+ <jsp:include page='/WEB-INF/templates/footer.tpl.jsp' />
</div>
</body>
</html>
diff --git a/jsp/war/WEB-INF/templates/research.tpl.jsp b/jsp/war/WEB-INF/templates/research.tpl.jsp
index 9d1b915..1e5de20 100644
--- a/jsp/war/WEB-INF/templates/research.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research.tpl.jsp
@@ -1,13 +1,11 @@
-<div>
- <h2>Tor Metrics Portal: Research</h2>
- <br/>
- <p>The Tor Metrics Project aims at supporting privacy enhancing
- technologies research by making <a href="papers.html">papers</a>
- and technical reports, gathered network
- <a href="/research/data.html">data</a>, and <a href="/research/tools.html">tools</a>
- for processing these data available to the public. If you are
- missing anything for your Tor-related research or want to share
- your research results with others, please
- <a href="mailto:tor-assistants at freehaven.net">let us know</a>!
-</div>
-
+ <h2>Tor Metrics Portal: Research</h2>
+ <br/>
+ <p>The Tor Metrics Project aims at supporting privacy enhancing
+ technologies research by making <a href="papers.html">papers</a>
+ and technical reports, gathered network
+ <a href="/research/data.html">data</a>, and
+ <a href="/research/tools.html">tools</a>
+ for processing these data available to the public. If you are
+ missing anything for your Tor-related research or want to share
+ your research results with others, please
+ <a href="mailto:tor-assistants at freehaven.net">let us know</a>!
diff --git a/jsp/war/WEB-INF/templates/research_data.tpl.jsp b/jsp/war/WEB-INF/templates/research_data.tpl.jsp
index 845516a..0632d3e 100644
--- a/jsp/war/WEB-INF/templates/research_data.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research_data.tpl.jsp
@@ -1,4 +1,3 @@
-<div>
<h2>Tor Metrics Portal: Data</h2>
<br/>
<p>One of the main goals of the Tor Metrics Project is to make all
@@ -1258,4 +1257,3 @@
<td><a href="data/siv-5mb.data">5 MiB requests</a></td>
</tr>
</table>
-</div>
diff --git a/jsp/war/WEB-INF/templates/research_papers.tpl.jsp b/jsp/war/WEB-INF/templates/research_papers.tpl.jsp
index a3ea63f..d32c91a 100644
--- a/jsp/war/WEB-INF/templates/research_papers.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research_papers.tpl.jsp
@@ -1,4 +1,3 @@
-<div>
<h2>Tor Metrics Portal: Papers</h2>
<br/>
<p>The <a href="#papers">papers</a> and
@@ -64,4 +63,3 @@
(<a href="papers/geoipdbcomp-2009-10-23.pdf">PDF</a>,
546K from October 23, 2009).</li>
</ul>
-</div>
diff --git a/jsp/war/WEB-INF/templates/research_tools.tpl.jsp b/jsp/war/WEB-INF/templates/research_tools.tpl.jsp
index a14dcd3..866d6ed 100644
--- a/jsp/war/WEB-INF/templates/research_tools.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research_tools.tpl.jsp
@@ -1,4 +1,3 @@
- <div>
<h2>Tor Metrics Portal: Tools</h2>
<br/>
<p>This page contains a collection of tools that can be used to
@@ -86,4 +85,3 @@
<a href="https://svn.torproject.org/svn/torperf/trunk/">SVN repository</a></li>
<li><tt>svn co https://svn.torproject.org/svn/torperf/trunk torperf</tt></li>
</ul>
- </div>
diff --git a/jsp/war/WEB-INF/templates/status.tpl.jsp b/jsp/war/WEB-INF/templates/status.tpl.jsp
index 980a90f..1cbde54 100644
--- a/jsp/war/WEB-INF/templates/status.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/status.tpl.jsp
@@ -1,14 +1,12 @@
- <div>
- <h2>Tor Metrics Portal: Status</h2>
- <br/>
- <p>The network data collected by the Tor Metrics Project can be
- used to analyze the Tor network status from a few years ago until
- an hour ago. There are currently two applications for this data:
- The <a href="exonerator.html">ExoneraTor</a> tells you whether
- some IP address was a Tor relay at a given time, and the
- <a href="consensus-health.html">Consensus Health</a> summarizes
- information about the latest network consensus voting process.
- The <a href="log.html">Last Log</a> of the metrics portal software
- execution also falls under this category to evaluate how recent
- and complete the presented data are.
- </div>
+ <h2>Tor Metrics Portal: Status</h2>
+ <br/>
+ <p>The network data collected by the Tor Metrics Project can be
+ used to analyze the Tor network status from a few years ago until
+ an hour ago. There are currently two applications for this data:
+ The <a href="exonerator.html">ExoneraTor</a> tells you whether
+ some IP address was a Tor relay at a given time, and the
+ <a href="consensus-health.html">Consensus Health</a> summarizes
+ information about the latest network consensus voting process.
+ The <a href="log.html">Last Log</a> of the metrics portal software
+ execution also falls under this category to evaluate how recent
+ and complete the presented data are.
diff --git a/jsp/war/WEB-INF/web.xml b/jsp/war/WEB-INF/web.xml
index 1cdfc34..53e87de 100644
--- a/jsp/war/WEB-INF/web.xml
+++ b/jsp/war/WEB-INF/web.xml
@@ -86,50 +86,4 @@
<servlet-name>ErnieGeneratedFile</servlet-name>
<url-pattern>/data/*</url-pattern>
</servlet-mapping>
- <!--
- <servlet>
- <servlet-name>BridgeUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.BridgeUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ErnieGeneratedFile</servlet-name>
- <url-pattern>/graphs.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>BridgeUsersGraphs</servlet-name>
- <url-pattern>/bridge-users-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ExitRelaysGraphsServlet</servlet-name>
- <servlet-class>org.torproject.ernie.web.ExitRelaysGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ExitRelaysGraphsServlet</servlet-name>
- <url-pattern>/exit-relays-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>ConsensusGraphsServlet</servlet-name>
- <servlet-class>org.torproject.ernie.web.ConsensusGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ConsensusGraphsServlet</servlet-name>
- <url-pattern>/consensus-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>NewUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.NewUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>NewUsersGraphs</servlet-name>
- <url-pattern>/new-users-graphs.html</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>RecurringUsersGraphs</servlet-name>
- <servlet-class>org.torproject.ernie.web.RecurringUsersGraphsServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RecurringUsersGraphs</servlet-name>
- <url-pattern>/recurring-users-graphs.html</url-pattern>
- </servlet-mapping>
--->
</web-app>
diff --git a/jsp/war/index.jsp b/jsp/war/index.jsp
index 45e34b8..dfa63bf 100644
--- a/jsp/war/index.jsp
+++ b/jsp/war/index.jsp
@@ -1,6 +1,4 @@
<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
-
<jsp:setProperty name="template" property="template" value="index"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal"/>
-
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/research.jsp b/jsp/war/research.jsp
index e9c5444..ea796fb 100644
--- a/jsp/war/research.jsp
+++ b/jsp/war/research.jsp
@@ -1,6 +1,4 @@
<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
-
<jsp:setProperty name="template" property="template" value="research"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Reserch"/>
-
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/status.jsp b/jsp/war/status.jsp
index 5126f78..36a7aa4 100644
--- a/jsp/war/status.jsp
+++ b/jsp/war/status.jsp
@@ -1,6 +1,4 @@
<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
-
<jsp:setProperty name="template" property="template" value="status"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Status"/>
-
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java b/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
deleted file mode 100644
index ee1788e..0000000
--- a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.torproject.ernie.web;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-
-public class BridgeUsersGraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- PrintWriter out = response.getWriter();
- out.print("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
- + "<html>\n"
- + " <head>\n"
- + " <title>Tor Metrics Portal: Tor users via bridges</title>\n"
- + " <meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\n"
- + " <link href=\"http://www.torproject.org/stylesheet-ltr.css\" type=text/css rel=stylesheet>\n"
- + " <link href=\"http://www.torproject.org/favicon.ico\" type=image/x-icon rel=\"shortcut icon\">\n"
- + " </head>\n"
- + " <body>\n"
- + " <div class=\"center\">\n"
- + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n"
- + " <tr>\n"
- + " <td class=\"banner-left\"><a href=\"https://www.torproject.org/\"><img src=\"http://www.torproject.org/images/top-left.png\" alt=\"Click to go to home page\" width=\"193\" height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\">\n"
- + " <a href=\"/\">Home</a>\n"
- + " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"research.html\">Research</a>\n"
- + " <a href=\"status.html\">Status</a>\n"
- + " <br/>\n"
- + " <font size=\"2\">\n"
- + " <a href=\"consensus-graphs.html\">Network size</a>\n"
- + " <a href=\"exit-relays-graphs.html\">Exit relays</a>\n"
- + " <a href=\"new-users-graphs.html\">New users</a>\n"
- + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
- + " <a class=\"current\">Bridge users</a>\n"
- + " <a href=\"torperf-graphs.html\">torperf</a>\n"
- + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
- + " </font>\n"
- + " </td>\n"
- + " <td class=\"banner-right\"></td>\n"
- + " </tr>\n"
- + " </table>\n"
- + " <div class=\"main-column\">\n"
- + " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Tor users via bridges</h3>\n"
- + " <br/>\n"
- + " <p>Users who cannot connect directly to the Tor network instead\n"
- + " connect via bridges, which are non-public relays. The following\n"
- + " graphs display an estimate of Tor users via bridges based on the\n"
- + " unique IP addresses as seen by a few hundred bridges.</p>\n"
- + " <ul>\n"
- + " <li><a href=\"#bahrain\">Bahrain</a></li>\n"
- + " <li><a href=\"#china\">China</a></li>\n"
- + " <li><a href=\"#cuba\">Cuba</a></li>\n"
- + " <li><a href=\"#ethiopia\">Ethiopia</a></li>\n"
- + " <li><a href=\"#iran\">Iran</a></li>\n"
- + " <li><a href=\"#burma\">Burma</a></li>\n"
- + " <li><a href=\"#saudi\">Saudi</a></li>\n"
- + " <li><a href=\"#syria\">Syria</a></li>\n"
- + " <li><a href=\"#tunisia\">Tunisia</a></li>\n"
- + " <li><a href=\"#turkmenistan\">Turkmenistan</a></li>\n"
- + " <li><a href=\"#uzbekistan\">Uzbekistan</a></li>\n"
- + " <li><a href=\"#vietnam\">Vietnam</a></li>\n"
- + " <li><a href=\"#yemen\">Yemen</a></li>\n"
- + " </ul>\n"
- + " <ul>\n"
- + " <li><a href=\"csv/bridge-users.csv\">CSV</a> file containing all\n"
- + " data.</li>\n"
- + " <li><a href=\"csv/monthly-users-peak.csv\">CSV</a> "
- + "file containing peak daily Tor users (recurring and bridge) "
- + "per month by country.</li>\n"
- + " <li><a href=\"csv/monthly-users-average.csv\">"
- + "CSV</a> file containing average daily Tor users (recurring "
- + "and bridge) per month by country.</li>\n"
- + " </ul>"
- + " ");
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
- List<String> suffixes = new ArrayList<String>(Arrays.asList(
- "30d,90d,180d,all".split(",")));
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- suffixes.add(String.format("%tY", now));
- suffixes.add(String.format("%1$tY-q%2$d", now,
- 1 + now.get(Calendar.MONTH) / 3));
- suffixes.add(String.format("%1$tY-%1$tm", now));
- for (String country : countries) {
- out.print("<p><a id=\"" + country + "\"/>\n");
- for (String suffix : suffixes) {
- out.print(" <img src=\"graphs/bridge-users/" + country
- + "-bridges-" + suffix + ".png\"/>\n");
- }
- out.print(" </p>");
- }
- out.print("<br/>\n"
- + " </div>\n"
- + " </div>\n"
- + " <div class=\"bottom\" id=\"bottom\">\n"
- + " <p>\"Tor\" and the \"Onion Logo\" are <a href=\"https://www.torproject.org/trademark-faq.html.en\">registered trademarks</a> of The Tor Project, Inc.</p>\n"
- + " </div>\n"
- + " </body>\n"
- + "</html>\n");
- out.close();
- }
-}
-
diff --git a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java b/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
deleted file mode 100644
index 2b5ed0e..0000000
--- a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.torproject.ernie.web;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-
-public class ConsensusGraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- PrintWriter out = response.getWriter();
- out.print("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
- + "<html>\n"
- + " <head>\n"
- + " <title>Tor Metrics Portal: Relays and bridges in the Tor network</title>\n"
- + " <meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\n"
- + " <link href=\"http://www.torproject.org/stylesheet-ltr.css\" type=text/css rel=stylesheet>\n"
- + " <link href=\"http://www.torproject.org/favicon.ico\" type=image/x-icon rel=\"shortcut icon\">\n"
- + " </head>\n"
- + " <body>\n"
- + " <div class=\"center\">\n"
- + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n"
- + " <tr>\n"
- + " <td class=\"banner-left\"><a href=\"https://www.torproject.org/\"><img src=\"http://www.torproject.org/images/top-left.png\" alt=\"Click to go to home page\" width=\"193\" height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\">\n"
- + " <a href=\"/\">Home</a>\n"
- + " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"research.html\">Research</a>\n"
- + " <a href=\"status.html\">Status</a>\n"
- + " <br/>\n"
- + " <font size=\"2\">\n"
- + " <a class=\"current\">Network size</a>\n"
- + " <a href=\"exit-relays-graphs.html\">Exit relays</a>\n"
- + " <a href=\"new-users-graphs.html\">New users</a>\n"
- + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
- + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
- + " <a href=\"torperf-graphs.html\">torperf</a>\n"
- + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
- + " </font>\n"
- + " </td>\n"
- + " <td class=\"banner-right\"></td>\n"
- + " </tr>\n"
- + " </table>\n"
- + " <div class=\"main-column\">\n"
- + " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Relays and bridges in the Tor network</h3>\n"
- + " <br/>\n"
- + " <p>The number of relays and bridges in the Tor network can be extracted from\n"
- + " the hourly published network status consensuses and sanitized bridge statuses.</p>\n"
- + " <ul>\n"
- + " <li>Past <a href=\"#networksize-30d\">30</a>,\n"
- + " <a href=\"#networksize-90d\">90</a>,\n"
- + " <a href=\"#networksize-180d\">180</a> days</li>\n"
- + " <li><a href=\"#networksize-all\">All data</a> up to today</li>\n"
- + " <li>Annual graphs of\n");
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- lastQuarter.add(Calendar.MONTH, -3);
- Calendar lastMonth = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- lastMonth.add(Calendar.MONTH, -1);
- for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
- out.print(" <a href=\"#networksize-" + i + "\">"
- + i + "</a>,\n");
- }
- out.print(" <a href=\"#networksize-2006\">2006</a></li>\n");
- out.print(" <li>Quarterly graphs of\n");
- out.printf(" <a href=\"#networksize-%1$tY-q%2$d\">"
- + "Q%2$d %1$tY</a>,%n", now, 1 + now.get(Calendar.MONTH) / 3);
- out.printf(" <a href=\"#networksize-%1$tY-q%2$d\">"
- + "Q%2$d %1$tY</a></li>%n", lastQuarter, 1 + lastQuarter.get(Calendar.MONTH) / 3);
- out.print(" <li>Monthly graphs of\n");
- out.printf(" <a href=\"#networksize-%1$tY-%1$tm\">"
- + "%1$tb %1$tY</a>,%n", now);
- out.printf(" <a href=\"#networksize-%1$tY-%1$tm\">"
- + "%1$tb %1$tY</a></li>%n", lastMonth);
- out.print(" <li><a href=\"csv/networksize.csv\">CSV</a> file\n"
- + " containing raw data</li>\n"
- + " </ul>\n"
- + " <p><a id=\"networksize-30d\"/>\n"
- + " <img src=\"graphs/networksize/networksize-30d.png\"/>\n"
- + " </p><p><a id=\"networksize-90d\"/>\n"
- + " <img src=\"graphs/networksize/networksize-90d.png\"/>\n"
- + " </p><p><a id=\"networksize-180d\"/>\n"
- + " <img src=\"graphs/networksize/networksize-180d.png\"/>\n"
- + " </p><p><a id=\"networksize-all\"/>\n"
- + " <img src=\"graphs/networksize/networksize-all.png\"/>\n");
- for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
- out.print(" </p><p><a id=\"networksize-" + i + "\"/>\n"
- + " <img src=\"graphs/networksize/networksize-" + i + ".png\"/>\n");
- }
- out.print(" </p><p><a id=\"networksize-2006\"/>\n"
- + " <img src=\"graphs/networksize/networksize-2006.png\"/>\n");
- out.printf(" </p><p><a id=\"networksize-%1$tY-q%2$d\"/>\n"
- + " <img src=\"graphs/networksize/networksize-%1$tY-q%2$d.png\"/>\n",
- now, 1 + now.get(Calendar.MONTH) / 3);
- out.printf(" </p><p><a id=\"networksize-%1$tY-q%2$d\"/>\n"
- + " <img src=\"graphs/networksize/networksize-%1$tY-q%2$d.png\"/>\n",
- lastQuarter, 1 + lastQuarter.get(Calendar.MONTH) / 3);
- out.printf(" </p><p><a id=\"networksize-%1$tY-%1$tm\"/>\n"
- + " <img src=\"graphs/networksize/networksize-%1$tY-%1$tm.png\"/>\n", now);
- out.printf(" </p><p><a id=\"networksize-%1$tY-%1$tm\"/>\n"
- + " <img src=\"graphs/networksize/networksize-%1$tY-%1$tm.png\"/>\n", lastMonth);
- out.print(" </p><br/>\n"
- + " </div>\n"
- + " </div>\n"
- + " <div class=\"bottom\" id=\"bottom\">\n"
- + " <p>\"Tor\" and the \"Onion Logo\" are <a href=\"https://www.torproject.org/trademark-faq.html.en\">registered trademarks</a> of The Tor Project, Inc.</p>\n"
- + " </div>\n"
- + " </body>\n"
- + "</html>\n");
- out.close();
- }
-}
-
diff --git a/src/org/torproject/ernie/web/ExitRelaysGraphsServlet.java b/src/org/torproject/ernie/web/ExitRelaysGraphsServlet.java
deleted file mode 100644
index 929c9ee..0000000
--- a/src/org/torproject/ernie/web/ExitRelaysGraphsServlet.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.torproject.ernie.web;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-
-public class ExitRelaysGraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- PrintWriter out = response.getWriter();
- out.print("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
- + "<html>\n"
- + " <head>\n"
- + " <title>Tor Metrics Portal: Exit relays in the Tor network</title>\n"
- + " <meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\n"
- + " <link href=\"http://www.torproject.org/stylesheet-ltr.css\" type=text/css rel=stylesheet>\n"
- + " <link href=\"http://www.torproject.org/favicon.ico\" type=image/x-icon rel=\"shortcut icon\">\n"
- + " </head>\n"
- + " <body>\n"
- + " <div class=\"center\">\n"
- + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n"
- + " <tr>\n"
- + " <td class=\"banner-left\"><a href=\"https://www.torproject.org/\"><img src=\"http://www.torproject.org/images/top-left.png\" alt=\"Click to go to home page\" width=\"193\" height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\">\n"
- + " <a href=\"/\">Home</a>\n"
- + " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"research.html\">Research</a>\n"
- + " <a href=\"status.html\">Status</a>\n"
- + " <br/>\n"
- + " <font size=\"2\">\n"
- + " <a href=\"consensus-graphs.html\">Network size</a>\n"
- + " <a class=\"current\">Exit relays</a>\n"
- + " <a href=\"new-users-graphs.html\">New users</a>\n"
- + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
- + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
- + " <a href=\"torperf-graphs.html\">torperf</a>\n"
- + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
- + " </font>\n"
- + " </td>\n"
- + " <td class=\"banner-right\"></td>\n"
- + " </tr>\n"
- + " </table>\n"
- + " <div class=\"main-column\">\n"
- + " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Exit relays in the Tor network</h3>\n"
- + " <br/>\n"
- + " <p>The number of exit relays in the Tor network can be extracted from\n"
- + " the hourly published network status consensuses.</p>\n"
- + " <ul>\n"
- + " <li>Past <a href=\"#exit-72h\">72 hours</a> up to\n"
- + " now</li>\n"
- + " <li>Past <a href=\"#exit-30d\">30</a>,\n"
- + " <a href=\"#exit-90d\">90</a>,\n"
- + " <a href=\"#exit-180d\">180</a> days</li>\n"
- + " <li><a href=\"#exit-all\">All data</a> up to today</li>\n"
- + " <li>Annual graphs of\n");
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- lastQuarter.add(Calendar.MONTH, -3);
- Calendar lastMonth = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- lastMonth.add(Calendar.MONTH, -1);
- for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
- out.print(" <a href=\"#exit-" + i + "\">"
- + i + "</a>,\n");
- }
- out.print(" <a href=\"#exit-2006\">2006</a></li>\n");
- out.print(" <li>Quarterly graphs of\n");
- out.printf(" <a href=\"#exit-%1$tY-q%2$d\">"
- + "Q%2$d %1$tY</a>,%n", now, 1 + now.get(Calendar.MONTH) / 3);
- out.printf(" <a href=\"#exit-%1$tY-q%2$d\">"
- + "Q%2$d %1$tY</a></li>%n", lastQuarter, 1 + lastQuarter.get(Calendar.MONTH) / 3);
- out.print(" <li>Monthly graphs of\n");
- out.printf(" <a href=\"#exit-%1$tY-%1$tm\">"
- + "%1$tb %1$tY</a>,%n", now);
- out.printf(" <a href=\"#exit-%1$tY-%1$tm\">"
- + "%1$tb %1$tY</a></li>%n", lastMonth);
- out.print(" <li><a href=\"csv/exit.csv\">CSV</a> file\n"
- + " containing raw data</li>\n"
- + " </ul>\n");
- out.print(" </p><p><a id=\"exit-72h\"/><img src=\"graphs/exit/exit-72h.png\"/>\n"
- + " </p><p><a id=\"exit-30d\"/><img src=\"graphs/exit/exit-30d.png\"/>\n"
- + " </p><p><a id=\"exit-90d\"/><img src=\"graphs/exit/exit-90d.png\"/>\n"
- + " </p><p><a id=\"exit-180d\"/><img src=\"graphs/exit/exit-180d.png\"/>\n"
- + " </p><p><a id=\"exit-all\"/><img src=\"graphs/exit/exit-all.png\"/>\n");
- for (int i = now.get(Calendar.YEAR); i > 2006; i--) {
- out.print(" </p><p><a id=\"exit-" + i + "\"/><img src=\"graphs/exit/exit-" + i + ".png\"/>\n");
- }
- out.print(" </p><p><a id=\"exit-2006\"/><img src=\"graphs/exit/exit-2006.png\"/>\n");
- out.printf(" </p><p><a id=\"exit-%1$tY-q%2$d\"/><img src=\"graphs/exit/exit-%1$tY-q%2$d.png\"/>\n",
- now, 1 + now.get(Calendar.MONTH) / 3);
- out.printf(" </p><p><a id=\"exit-%1$tY-q%2$d\"/><img src=\"graphs/exit/exit-%1$tY-q%2$d.png\"/>\n",
- lastQuarter, 1 + lastQuarter.get(Calendar.MONTH) / 3);
- out.printf(" </p><p><a id=\"exit-%1$tY-%1$tm\"/><img src=\"graphs/exit/exit-%1$tY-%1$tm.png\"/>\n", now);
- out.printf(" </p><p><a id=\"exit-%1$tY-%1$tm\"/><img src=\"graphs/exit/exit-%1$tY-%1$tm.png\"/>\n", lastMonth);
- out.print(" </p><br/>\n"
- + " </div>\n"
- + " </div>\n"
- + " <div class=\"bottom\" id=\"bottom\">\n"
- + " <p>\"Tor\" and the \"Onion Logo\" are <a href=\"https://www.torproject.org/trademark-faq.html.en\">registered trademarks</a> of The Tor Project, Inc.</p>\n"
- + " </div>\n"
- + " </body>\n"
- + "</html>\n");
- out.close();
- }
-}
-
diff --git a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java b/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
deleted file mode 100644
index 276ba32..0000000
--- a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.torproject.ernie.web;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-
-public class NewUsersGraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- PrintWriter out = response.getWriter();
- out.print("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
- + "<html>\n"
- + " <head>\n"
- + " <title>Tor Metrics Portal: New or returning, directly connecting Tor users</title>\n"
- + " <meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\n"
- + " <link href=\"http://www.torproject.org/stylesheet-ltr.css\" type=text/css rel=stylesheet>\n"
- + " <link href=\"http://www.torproject.org/favicon.ico\" type=image/x-icon rel=\"shortcut icon\">\n"
- + " </head>\n"
- + " <body>\n"
- + " <div class=\"center\">\n"
- + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n"
- + " <tr>\n"
- + " <td class=\"banner-left\"><a href=\"https://www.torproject.org/\"><img src=\"http://www.torproject.org/images/top-left.png\" alt=\"Click to go to home page\" width=\"193\" height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\">\n"
- + " <a href=\"/\">Home</a>\n"
- + " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"research.html\">Research</a>\n"
- + " <a href=\"status.html\">Status</a>\n"
- + " <br/>\n"
- + " <font size=\"2\">\n"
- + " <a href=\"consensus-graphs.html\">Network size</a>\n"
- + " <a href=\"exit-relays-graphs.html\">Exit relays</a>\n"
- + " <a class=\"current\">New users</a>\n"
- + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
- + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
- + " <a href=\"torperf-graphs.html\">torperf</a>\n"
- + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
- + " </font>\n"
- + " </td>\n"
- + " <td class=\"banner-right\"></td>\n"
- + " </tr>\n"
- + " </table>\n"
- + " <div class=\"main-column\">\n"
- + " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>New or returning, directly connecting Tor users</h3>\n"
- + " <br/>\n"
- + " <p>Users connecting to the Tor network for the first time request\n"
- + " a list of running relays from one of currently seven directory\n"
- + " authorities. Likewise, returning users whose network information is\n"
- + " out of date connect to one of the directory authorities to\n"
- + " download a fresh list of relays. The following graphs display an\n"
- + " estimate of new or returning Tor users based on the requests as\n"
- + " seen by gabelmoo, one of the directory authorities.</p>\n"
- + " <ul>\n"
- + " <li><a href=\"#bahrain\">Bahrain</a></li>\n"
- + " <li><a href=\"#china\">China</a></li>\n"
- + " <li><a href=\"#cuba\">Cuba</a></li>\n"
- + " <li><a href=\"#ethiopia\">Ethiopia</a></li>\n"
- + " <li><a href=\"#iran\">Iran</a></li>\n"
- + " <li><a href=\"#burma\">Burma</a></li>\n"
- + " <li><a href=\"#saudi\">Saudi</a></li>\n"
- + " <li><a href=\"#syria\">Syria</a></li>\n"
- + " <li><a href=\"#tunisia\">Tunisia</a></li>\n"
- + " <li><a href=\"#turkmenistan\">Turkmenistan</a></li>\n"
- + " <li><a href=\"#uzbekistan\">Uzbekistan</a></li>\n"
- + " <li><a href=\"#vietnam\">Vietnam</a></li>\n"
- + " <li><a href=\"#yemen\">Yemen</a></li>\n"
- + " </ul>\n"
- + " <ul>\n"
- + " <li><a href=\"csv/new-users.csv\">CSV</a> file containing all\n"
- + " data.</li>\n"
- + " </ul>\n"
- + " ");
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
- List<String> suffixes = new ArrayList<String>(Arrays.asList(
- "30d,90d,180d,all".split(",")));
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- suffixes.add(String.format("%tY", now));
- suffixes.add(String.format("%1$tY-q%2$d", now,
- 1 + now.get(Calendar.MONTH) / 3));
- suffixes.add(String.format("%1$tY-%1$tm", now));
- for (String country : countries) {
- out.print("<p><a id=\"" + country + "\"/>\n");
- for (String suffix : suffixes) {
- out.print(" <img src=\"graphs/new-users/" + country
- + "-new-" + suffix + ".png\"/>\n");
- }
- out.print(" </p>");
- }
- out.print("<br/>\n"
- + " </div>\n"
- + " </div>\n"
- + " <div class=\"bottom\" id=\"bottom\">\n"
- + " <p>\"Tor\" and the \"Onion Logo\" are <a href=\"https://www.torproject.org/trademark-faq.html.en\">registered trademarks</a> of The Tor Project, Inc.</p>\n"
- + " </div>\n"
- + " </body>\n"
- + "</html>\n");
- out.close();
- }
-}
-
diff --git a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java b/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
deleted file mode 100644
index 0294025..0000000
--- a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.torproject.ernie.web;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-
-public class RecurringUsersGraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- PrintWriter out = response.getWriter();
- out.print("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
- + "<html>\n"
- + " <head>\n"
- + " <title>Tor Metrics Portal: Recurring, directly connecting Tor users</title>\n"
- + " <meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\n"
- + " <link href=\"http://www.torproject.org/stylesheet-ltr.css\" type=text/css rel=stylesheet>\n"
- + " <link href=\"http://www.torproject.org/favicon.ico\" type=image/x-icon rel=\"shortcut icon\">\n"
- + " </head>\n"
- + " <body>\n"
- + " <div class=\"center\">\n"
- + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n"
- + " <tr>\n"
- + " <td class=\"banner-left\"><a href=\"https://www.torproject.org/\"><img src=\"http://www.torproject.org/images/top-left.png\" alt=\"Click to go to home page\" width=\"193\" height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\">\n"
- + " <a href=\"/\">Home</a>\n"
- + " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"research.html\">Research</a>\n"
- + " <a href=\"status.html\">Status</a>\n"
- + " <br/>\n"
- + " <font size=\"2\">\n"
- + " <a href=\"consensus-graphs.html\">Network size</a>\n"
- + " <a href=\"exit-relays-graphs.html\">Exit relays</a>\n"
- + " <a href=\"new-users-graphs.html\">New users</a>\n"
- + " <a class=\"current\">Recurring users</a>\n"
- + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
- + " <a href=\"torperf-graphs.html\">torperf</a>\n"
- + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
- + " </font>\n"
- + " </td>\n"
- + " <td class=\"banner-right\"></td>\n"
- + " </tr>\n"
- + " </table>\n"
- + " <div class=\"main-column\">\n"
- + " <h2>Tor Metrics Portal: Graphs</h2>\n"
- + " <br/>\n"
- + " <h3>Recurring, directly connecting Tor users</h3>\n"
- + " <br/>\n"
- + " <p>After being connected to the Tor network, users need to refresh\n"
- + " their list of running relays on a regular basis. They send their\n"
- + " requests to one out of a few hundred directory mirrors to save\n"
- + " bandwidth of the directory authorities. The following graphs show\n"
- + " an estimate of recurring Tor users based on the requests as seen\n"
- + " by trusted, a particularly fast directory mirror.</p>\n"
- + " <ul>\n"
- + " <li><a href=\"#bahrain\">Bahrain</a></li>\n"
- + " <li><a href=\"#china\">China</a></li>\n"
- + " <li><a href=\"#cuba\">Cuba</a></li>\n"
- + " <li><a href=\"#ethiopia\">Ethiopia</a></li>\n"
- + " <li><a href=\"#iran\">Iran</a></li>\n"
- + " <li><a href=\"#burma\">Burma</a></li>\n"
- + " <li><a href=\"#saudi\">Saudi</a></li>\n"
- + " <li><a href=\"#syria\">Syria</a></li>\n"
- + " <li><a href=\"#tunisia\">Tunisia</a></li>\n"
- + " <li><a href=\"#turkmenistan\">Turkmenistan</a></li>\n"
- + " <li><a href=\"#uzbekistan\">Uzbekistan</a></li>\n"
- + " <li><a href=\"#vietnam\">Vietnam</a></li>\n"
- + " <li><a href=\"#yemen\">Yemen</a></li>\n"
- + " </ul>\n"
- + " <ul>\n"
- + " <li><a href=\"csv/recurring-users.csv\">CSV</a> file containing\n"
- + " all data.</li>\n"
- + " <li><a href=\"csv/monthly-users-peak.csv\">CSV</a> "
- + "file containing peak daily Tor users (recurring and bridge) "
- + "per month by country.</li>\n"
- + " <li><a href=\"csv/monthly-users-average.csv\">"
- + "CSV</a> file containing average daily Tor users (recurring "
- + "and bridge) per month by country.</li>\n"
- + " </ul>\n"
- + " ");
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
- List<String> suffixes = new ArrayList<String>(Arrays.asList(
- "30d,90d,180d,all".split(",")));
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- suffixes.add(String.format("%tY", now));
- suffixes.add(String.format("%1$tY-q%2$d", now,
- 1 + now.get(Calendar.MONTH) / 3));
- suffixes.add(String.format("%1$tY-%1$tm", now));
- for (String country : countries) {
- out.print("<p><a id=\"" + country + "\"/>\n");
- for (String suffix : suffixes) {
- out.print(" <img src=\"graphs/direct-users/" + country
- + "-direct-" + suffix + ".png\"/>\n");
- }
- out.print(" </p>");
- }
- out.print("<br/>\n"
- + " </div>\n"
- + " </div>\n"
- + " <div class=\"bottom\" id=\"bottom\">\n"
- + " <p>\"Tor\" and the \"Onion Logo\" are <a href=\"https://www.torproject.org/trademark-faq.html.en\">registered trademarks</a> of The Tor Project, Inc.</p>\n"
- + " </div>\n"
- + " </body>\n"
- + "</html>\n");
- out.close();
- }
-}
-
diff --git a/website/data.html b/website/data.html
deleted file mode 100644
index e399e55..0000000
--- a/website/data.html
+++ /dev/null
@@ -1,1301 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Data</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="papers.html">Papers</a>
- <a class="current">Data</a>
- <a href="tools.html">Tools</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Data</h2>
- <br/>
- <p>One of the main goals of the Tor Metrics Project is to make all
- gathered data available to the public. This approach enables
- privacy researchers to perform their own analyses using real data
- on the Tor network, and it acts as a safeguard to not gather data
- that are too sensitive to publish. All signatures can be
- <a href="https://www.torproject.org/verifying-signatures">verified</a>
- using Karsten's PGP key (0xF7C11265). The following data are
- available (see the <a href="tools.html">Tools</a> section for
- details on processing the files):</p>
- <ul>
- <li><a href="#relaydesc">Relay descriptor archives</a></li>
- <li><a href="#bridgedesc">Bridge descriptor archives</a></li>
- <li><a href="#stats">Statistics produced by relays</a></li>
- <li><a href="#performance">Performance data</a></li>
- </ul>
- <br/>
- <a id="relaydesc"/>
- <h3>Relay descriptor archives</h3>
- <br/>
- <p>The relay descriptor archives contain all documents that the
- directory authorities make available about the network of relays.
- These documents include network statuses, server (relay)
- descriptors, and extra-info descriptors:</p>
- <table width="100%" border="0" cellpadding="5" cellspacing="0" summary="">
- <tr>
- <td>May 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-05.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-05.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>June 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-06.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-06.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>July 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-07.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-07.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>August 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-08.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-08.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>September 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-09.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-09.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>October 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-10.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-10.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>November 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-11.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-11.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>December 2004</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2004-12.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2004-12.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>January 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-01.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-01.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>February 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-02.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-02.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>March 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-03.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-03.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>April 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-04.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-04.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>May 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-05.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-05.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>June 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-06.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-06.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>July 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-07.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-07.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>August 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-08.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-08.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>September 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-09.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-09.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>October 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-10.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-10.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>November 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-11.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-11.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>December 2005</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2005-12.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2005-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2005-12.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2005-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2005-12.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2005-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2005-12.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2005-12.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>January 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-01.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-01.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-01.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-01.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-01.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>February 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-02.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-02.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-02.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-02.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-02.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>March 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-03.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-03.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-03.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-03.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-03.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>April 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-04.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-04.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-04.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-04.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-04.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>May 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-05.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-05.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-05.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-05.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-05.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>June 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-06.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-06.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-06.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-06.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-06.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>July 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-07.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-07.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-07.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-07.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-07.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>August 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-08.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-08.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-08.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-08.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-08.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>September 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-09.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-09.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-09.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-09.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-09.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>October 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-10.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-10.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-10.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-10.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-10.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>November 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-11.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-11.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-11.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-11.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-11.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>December 2006</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2006-12.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2006-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2006-12.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2006-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2006-12.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2006-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2006-12.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2006-12.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>January 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-01.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-01.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-01.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-01.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-01.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>February 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-02.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-02.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-02.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-02.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-02.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>March 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-03.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-03.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-03.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-03.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-03.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>April 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-04.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-04.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-04.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-04.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-04.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>May 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-05.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-05.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-05.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-05.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-05.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>June 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-06.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-06.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-06.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-06.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-06.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>July 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-07.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-07.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-07.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-07.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-07.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>August 2007</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/V1/tor-2007-08.tar.bz2">v1 directories</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/tor-2007-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-08.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-08.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-08.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-08.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>September 2007</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-09.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-09.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-09.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-09.tar.bz2.asc">sig</a>)</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>October 2007</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-10.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-10.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-10.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-10.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-10.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-10.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>November 2007</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-11.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-11.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-11.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-11.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-11.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-11.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>December 2007</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2007-12.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2007-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2007-12.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2007-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2007-12.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2007-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-12.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2007-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-12.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2007-12.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>January 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-01.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-01.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-01.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-01.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-01.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-01.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>February 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-02.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-02.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-02.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-02.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-02.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-02.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>March 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-03.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-03.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-03.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-03.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-03.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-03.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>April 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-04.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-04.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-04.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-04.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-04.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-04.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>May 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-05.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-05.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-05.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-05.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-05.tar.bzw">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-05.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>June 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-06.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-06.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-06.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-06.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-06.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-06.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>July 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-07.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-07.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-07.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-07.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-07.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-07.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>August 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-08.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-08.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-08.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-08.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-08.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-08.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>September 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-09.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-09.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-09.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-09.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-09.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-09.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>October 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-10.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-10.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-10.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-10.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-10.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-10.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>November 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-11.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-11.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-11.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-11.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-11.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-11.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>December 2008</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2008-12.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2008-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2008-12.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2008-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2008-12.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2008-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-12.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2008-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-12.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2008-12.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>January 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-01.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/server-descriptors-2009-01.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/extra-infos-2009-01.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-01.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-01.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-01.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>February 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-02.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-02.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-02.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-02.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-02.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-02.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>March 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-03.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-03.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-03.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-03.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-03.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-03.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>April 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-04.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-04.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-04.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-04.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-04.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-04.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>May 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-05.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-05.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-05.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-05.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-05.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-05.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>June 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-06.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-06.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-06.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-06.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-06.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-06.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-06.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>July 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-07.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-07.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-07.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-07.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-07.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-07.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-07.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>August 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-08.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-08.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-08.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-08.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-08.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-08.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-08.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>September 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-09.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-09.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-09.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-09.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-09.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-09.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-09.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>October 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-10.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-10.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-10.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-10.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-10.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-10.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-10.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>November 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-11.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-11.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-11.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-11.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-11.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-11.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-11.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>December 2009</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2009-12.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2009-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-12.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2009-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-12.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2009-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-12.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2009-12.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-12.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2009-12.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>January 2010</td>
- <td/>
- <td><a href="http://archive.torproject.org/tor-directory-authority-archive/statuses-2010-01.tar.bz2">v2 statuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/statuses-2010-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-01.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-01.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-01.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-01.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-01.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-01.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>February 2010</td>
- <td/>
- <td/>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-02.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-02.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-02.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-02.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-02.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-02.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>March 2010</td>
- <td/>
- <td/>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-03.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-03.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-03.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-03.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-03.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-03.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>April 2010</td>
- <td/>
- <td/>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-04.tar.bz2">server descriptors</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/server-descriptors-2010-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-04.tar.bz2">extra-infos</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/extra-infos-2010-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-04.tar.bz2">v3 votes</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/votes-2010-04.tar.bz2.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-04.tar.bz2">v3 consensuses</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/consensuses-2010-04.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>May 2010</td>
- <td/>
- <td/>
- <td><a href="/data/server-descriptors-2010-05.tar.bz2">server descriptors</a>
- (<a href="/data/server-descriptors-2010-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="/data/extra-infos-2010-05.tar.bz2">extra-infos</a>
- (<a href="/data/extra-infos-2010-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="/data/votes-2010-05.tar.bz2">v3 votes</a>
- (<a href="/data/votes-2010-05.tar.bz2.asc">sig</a>)</td>
- <td><a href="/data/consensuses-2010-05.tar.bz2">v3 consensuses</a>
- (<a href="/data/consensuses-2010-05.tar.bz2.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>June 2010</td>
- <td/>
- <td/>
- <td><a href="/data/server-descriptors-2010-06.tar.bz2">server descriptors</a></td>
- <td><a href="/data/extra-infos-2010-06.tar.bz2">extra-infos</a></td>
- <td><a href="/data/votes-2010-06.tar.bz2">v3 votes</a></td>
- <td><a href="/data/consensuses-2010-06.tar.bz2">v3 consensuses</a></td>
- </tr>
- </table>
- <br/>
- <a id="bridgedesc"/>
- <h3>Bridge descriptor archives</h3>
- <br/>
- <p>The bridge descriptor archives contain similar documents as the
- relay descriptor archives, but for the non-public bridges. The
- descriptors have been sanitized before publication to remove all
- information that could otherwise be used to locate bridges.
- Beginning with May 2010, we stopped resolving IP addresses to
- country codes and including those in the sanitized descriptors,
- because it was tough to maintain; if your research requires this
- or any other detail, contact us and we'll sort something out. The
- files below contain all documents of a given month:</p>
- <table width="100%" border="0" cellpadding="5" cellspacing="0" summary="">
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-05.tar.bz2">May 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-05.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-06.tar.bz2">June 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-06.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-07.tar.bz2">July 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-07.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-08.tar.bz2">August 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-08.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-09.tar.bz2">September 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-09.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-10.tar.bz2">October 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-10.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-11.tar.bz2">November 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-11.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-12.tar.bz2">December 2008</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2008-12.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-01.tar.bz2">January 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-01.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-02.tar.bz2">February 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-02.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-03.tar.bz2">March 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-03.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-04.tar.bz2">April 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-04.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-05.tar.bz2">May 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-05.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-06.tar.bz2">June 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-06.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-07.tar.bz2">July 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-07.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-08.tar.bz2">August 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-08.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-09.tar.bz2">September 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-09.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-10.tar.bz2">October 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-10.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-11.tar.bz2">November 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-11.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-12.tar.bz2">December 2009</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2009-12.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-01.tar.bz2">January 2010</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-01.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-02.tar.bz2">February 2010</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-02.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-03.tar.bz2">March 2010</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-03.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-04.tar.bz2">April 2010</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-04.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="/data/bridge-descriptors-2010-05.tar.bz2">May 2010</a>
- (<a href="/data/bridge-descriptors-2010-05.tar.bz2.asc">sig</a>)</td></tr>
- <tr><td><a href="/data/bridge-descriptors-2010-05.tar.bz2">June 2010</a></td></tr>
- </table>
- <p/>
- <br/>
- <a id="stats"/>
- <h3>Statistics produced by relays</h3>
- <br/>
- <p>Some of the relays are configured to gather statistics on the
- number of requests or connecting clients, the number of processed
- cells per queue, or the number of exiting bytes per port. Relays
- running version 0.2.2.4-alpha can include these statistics in
- extra-info descriptors, so that they are included in the relay
- descriptor archives. The following files contain the statistics
- produced by relays running earlier versions:</p>
- <table width="100%" border="0" cellpadding="5" cellspacing="0" summary="">
- <tr>
- <td>badbits (49E2C345)</td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-badbits-49E2C345FDA5E9ADFE13320690BF2C77EA803E6C">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-badbits-49E2C345FDA5E9ADFE13320690BF2C77EA803E6C.asc">sig</a>)</td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td>echelon1 (5D1D99A8)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon1-5D1D99A80F8688AD59004BA941E30CD5CD1487F9.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>echelon1 (511461B1)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-echelon1-511461B18F3A5CA036558C9A8FDD22B3D0A81EBB.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>echelon2 (925DEDE4)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon2-925DEDE4D0B1F39B45D646F500703D2B708CFA01.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>echelon2 (3EED5706)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon2-3EED570622FCC06DEF4D42042DD847D899893972">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-echelon2-3EED570622FCC06DEF4D42042DD847D899893972.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon2-3EED570622FCC06DEF4D42042DD847D899893972">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-echelon2-3EED570622FCC06DEF4D42042DD847D899893972.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon2-3EED570622FCC06DEF4D42042DD847D899893972">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-echelon2-3EED570622FCC06DEF4D42042DD847D899893972.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-echelon2-3EED570622FCC06DEF4D42042DD847D899893972">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-echelon2-3EED570622FCC06DEF4D42042DD847D899893972.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>ephemer2 (C11B5F70)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-ephemer2-C11B5F7056077BD4028255658AB49F6C28FD5017.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>fluxe3 (ED13D1D1)</td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-fluxe3-ED13D1D13C1E57C6A406DD64551D2F905AB99AFF">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-fluxe3-ED13D1D13C1E57C6A406DD64551D2F905AB99AFF.asc">sig</a>)</td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td>gabelmoo (68333D07)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-gabelmoo-68333D0761BCF397A587A0C0B963E4A9E99EC4D3.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>gonzales (501153AE)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-gonzales-501153AEE773283F48C63D5E27707B3B65500A77">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-gonzales-501153AEE773283F48C63D5E27707B3B65500A77.asc">sig</a>)</td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td>hamsterrad (B1980DCF)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-hamsterrad-B1980DCFA75A0CC5176B8725D41BE09A018B0780.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>ides (F397038A)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-ides-F397038ADC51336135E7B80BD99CA3844360292B">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-ides-F397038ADC51336135E7B80BD99CA3844360292B.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-ides-F397038ADC51336135E7B80BD99CA3844360292B">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-ides-F397038ADC51336135E7B80BD99CA3844360292B.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-ides-F397038ADC51336135E7B80BD99CA3844360292B">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-ides-F397038ADC51336135E7B80BD99CA3844360292B.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>moria1 (FFCB46DB)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-moria1-FFCB46DB1339DA84674C70D7CB586434C4370441.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>moria2 (719BE45D)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-moria2-719BE45DE224B607C53707D0E2143E2D423E74CF.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>moria5 (5644E26E)</td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria5-5644E26ECAC35C5C64B91E712A92A83E17E2A1F5">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-moria5-5644E26ECAC35C5C64B91E712A92A83E17E2A1F5.asc">sig</a>)</td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td>nottheNSA (74F93D60)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-nottheNSA-74F93D605D611684C06B5922732CA8EBC4B89AFE.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>SwissTorExit (F377AAB5)</td>
- <td></td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-SwissTorExit-F377AAB595C2C4C03252E041E44AA1C718082F3A">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-SwissTorExit-F377AAB595C2C4C03252E041E44AA1C718082F3A.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-SwissTorExit-F377AAB595C2C4C03252E041E44AA1C718082F3A">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-SwissTorExit-F377AAB595C2C4C03252E041E44AA1C718082F3A.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>TorTeamHelp (706CA141)</td>
- <td></td>
- <td></td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-TorTeamHelp-706CA141D3A1058B52509B4A1B6B28BF35AE5A0F">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-TorTeamHelp-706CA141D3A1058B52509B4A1B6B28BF35AE5A0F.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>TorTeamHelp (87B9B68D)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/exit-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715">exit-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/exit-TorTeamHelp-87B9B68D48431E28795AF65EEA7184803CCED715.asc">sig</a>)</td>
- </tr>
- <tr>
- <td>trusted (8522EB98)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-trusted-8522EB98C91496E80EC238E732594D1509158E77">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-trusted-8522EB98C91496E80EC238E732594D1509158E77.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-trusted-8522EB98C91496E80EC238E732594D1509158E77">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-trusted-8522EB98C91496E80EC238E732594D1509158E77.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-trusted-8522EB98C91496E80EC238E732594D1509158E77">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-trusted-8522EB98C91496E80EC238E732594D1509158E77.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>vallenator (7FB47171)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/buffer-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6">buffer-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/buffer-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6.asc">sig</a>)</td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/entry-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6">entry-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/entry-vallenator-7FB47171747D21E9827C2283C59EC1690B058BC6.asc">sig</a>)</td>
- <td></td>
- </tr>
- <tr>
- <td>xpdmTindome (1A477D8C)</td>
- <td></td>
- <td><a href="http://archive.torproject.org/tor-metrics-archive/dirreq-xpdmTindome-1A477D8C91F79459A7E880A5676118FF76169985">dirreq-stats</a>
- (<a href="http://archive.torproject.org/tor-metrics-archive/dirreq-xpdmTindome-1A477D8C91F79459A7E880A5676118FF76169985.asc">sig</a>)</td>
- <td></td>
- <td></td>
- </tr>
- </table>
- <br/>
- <a id="performance"/>
- <h3>Performance data</h3>
- <br/>
- <p>We are measuring the performance of the Tor network by
- periodically requesting files of different sizes and recording the
- time needed to do so. The files below contain the output of the
- torperf application and are updated every hour:</p>
- <table width="100%" border="0" cellpadding="5" cellspacing="0" summary="">
- <tr>
- <td>torperf</td>
- <td><a href="data/torperf-50kb.data">50 KiB requests</a></td>
- <td><a href="data/torperf-1mb.data">1 MiB requests</a></td>
- <td><a href="data/torperf-5mb.data">5 MiB requests</a></td>
- </tr>
- <tr>
- <td>moria</td>
- <td><a href="data/moria-50kb.data">50 KiB requests</a></td>
- <td><a href="data/moria-1mb.data">1 MiB requests</a></td>
- <td><a href="data/moria-5mb.data">5 MiB requests</a></td>
- </tr>
- <tr>
- <td>siv</td>
- <td><a href="data/siv-50kb.data">50 KiB requests</a></td>
- <td><a href="data/siv-1mb.data">1 MiB requests</a></td>
- <td><a href="data/siv-5mb.data">5 MiB requests</a></td>
- </tr>
- </table>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/gettor-graphs.html b/website/gettor-graphs.html
deleted file mode 100644
index 0a567d7..0000000
--- a/website/gettor-graphs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Packages delivered by GetTor</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="consensus-graphs.html">Network size</a>
- <a href="exit-relays-graphs.html">Exit relays</a>
- <a href="new-users-graphs.html">New users</a>
- <a href="recurring-users-graphs.html">Recurring users</a>
- <a href="bridge-users-graphs.html">Bridge users</a>
- <a href="torperf-graphs.html">torperf</a>
- <a class="current">GetTor</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>Packages requested from GetTor</h3>
- <br/>
- <p>GetTor allows users to fetch Tor via email. The following
- graphs show the number of requested packages per day.</p>
- <p><a href="csv/gettor.csv">CSV</a> file containing all data.</p>
- <img src="graphs/gettor/gettor-total.png"/>
- <img src="graphs/gettor/gettor-en.png"/>
- <img src="graphs/gettor/gettor-zh_cn.png"/>
- <img src="graphs/gettor/gettor-fa.png"/>
- <br/>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/graphs.html b/website/graphs.html
deleted file mode 100644
index 5ceb9cc..0000000
--- a/website/graphs.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Graphs</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a class="current">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="consensus-graphs.html">Network size</a>
- <a href="exit-relays-graphs.html">Exit relays</a>
- <a href="new-users-graphs.html">New users</a>
- <a href="recurring-users-graphs.html">Recurring users</a>
- <a href="bridge-users-graphs.html">Bridge users</a>
- <a href="torperf-graphs.html">torperf</a>
- <a href="gettor-graphs.html">GetTor</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <p>The graphs on this page visualize a small portion of the data
- gathered in the Tor Metrics Project. They are generated by a
- combination of shell scripts, Java applications, and R code (for
- details see the <a href="tools.html">Tools</a> section). The
- following graphs are available:</p>
- <ul>
- <li><a href="#relays">Relays in the Tor network</a></li>
- <li><a href="#newusers">New or returning, directly connecting
- Tor users</a></li>
- <li><a href="#recurringusers">Recurring, directly connecting Tor
- users</a></li>
- <li><a href="#bridgeusers">Tor users via bridges</a></li>
- <li><a href="#torperf">Time to complete requests</a></li>
- <li><a href="#gettor">Packages requested from GetTor</a></li>
- <li><a href="#versions">Relay versions</a></li>
- <li><a href="#platforms">Relay platforms</a></li>
- <li><a href="#bandwidth">Relay bandwidth</a></li>
- </ul>
- <br/>
- <a id="relays"/>
- <h3>Relays in the Tor network</h3>
- <br/>
- <p>The number of relays in the Tor network can be extracted from
- the hourly published network status consensuses.</p>
- <img src="graphs/networksize/networksize-30d.png"/>
- <p>Other graphs related to <a href="consensus-graphs.html">network
- size</a> and <a href="exit-relays-graphs.html">exit relays</a> can
- be found on separate pages.</p>
- <br/>
- <a id="newusers"/>
- <h3>New or returning, directly connecting Tor users</h3>
- <br/>
- <p>Users connecting to the Tor network for the first time request
- a list of running relays from one of currently seven directory
- authorities. Likewise, returning users whose network information is
- out of date connect to one of the directory authorities to
- download a fresh list of relays. The following graphs display an
- estimate of new or returning Tor users based on the requests as
- seen by gabelmoo, one of the directory authorities.</p>
- <img src="graphs/new-users/iran-new-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="new-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="recurringusers"/>
- <h3>Recurring, directly connecting Tor users</h3>
- <br/>
- <p>After being connected to the Tor network, users need to refresh
- their list of running relays on a regular basis. They send their
- requests to one out of a few hundred directory mirrors to save
- bandwidth of the directory authorities. The following graphs show
- an estimate of recurring Tor users based on the requests as seen
- by trusted, a particularly fast directory mirror.</p>
- <img src="graphs/direct-users/iran-direct-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="recurring-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="bridgeusers"/>
- <h3>Tor users via bridges</h3>
- <br/>
- <p>Users who cannot connect directly to the Tor network instead
- connect via bridges, which are non-public relays. The following
- graphs display an estimate of Tor users via bridges based on the
- unique IP addresses as seen by a few hundred bridges.</p>
- <img src="graphs/bridge-users/iran-bridges-30d.png"/>
- <p>Graphs for other countries can be found on a
- <a href="bridge-users-graphs.html">separate page</a>.</p>
- <br/>
- <a id="torperf"/>
- <h3>Time to complete requests</h3>
- <br/>
- <p>The following graphs show the performance of the Tor network as
- experienced by its users. The graphs contain the average (median)
- time to request files of three different sizes over the network as
- well as first and third quartile of request times.</p>
- <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
- <p>Graphs for other file sizes or time intervals can be found on a
- <a href="torperf-graphs.html">separate page</a>.</p>
- <br/>
- <a id="gettor"/>
- <h3>Packages requested from GetTor</h3>
- <br/>
- <p>GetTor allows users to fetch Tor via email. The following
- graphs show the number of requested packages per day.</p>
- <img src="graphs/gettor/gettor-total.png"/>
- <p>More graphs about specific packages can be found on a
- <a href="gettor-graphs.html">separate page</a>.</p>
- <br/>
- <a id="versions"/>
- <h3>Relay versions</h3>
- <br/>
- <p>Relays report the Tor version that they are running in their
- server descriptors that they send to the directory authorities.
- The following graph shows the number of relays running specific
- Tor versions.</p>
- <img src="graphs/descriptors/versions.png"/>
- <br/>
- <a id="platforms"/>
- <h3>Relay platforms</h3>
- <br/>
- <p>Relays further report the operating systems in their server
- descriptors that they send to the directory authorities. The
- following graph shows the number of relays running specific
- platforms.</p>
- <img src="graphs/descriptors/platforms.png"/>
- <br/>
- <a id="bandwidth"/>
- <h3>Relay bandwidth</h3>
- <br/>
- <p>Relays advertise how much bandwidth they are willing and
- to contribute in their server descriptors. The following graph
- shows the sum of advertised bandwidth of all relays in the
- network.</p>
- <img src="graphs/descriptors/bandwidth.png"/>
- <br/>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/index.html b/website/index.html
deleted file mode 100644
index 113ea84..0000000
--- a/website/index.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a class="current">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal</h2>
- <br/>
- <p>The Tor Metrics Portal aggregates all kinds of interesting
- data about the Tor network and visualizes them in graphs and
- reports. This portal also provides easy access to the underlying
- data and documentation for performing own analyses based on these
- data. Find out more here:</p>
- <ul>
- <li>View daily updated <a href="graphs.html">graphs</a> on
- estimated client numbers, on network performance, and other
- statistics on the Tor network</li>
- <li>Read <a href="papers.html">papers</a> and technical reports
- on the measurement techniques and results of statistical
- analysis of metrics data</li>
- <li>Download the <a href="data.html">data</a> that is behind the
- graphs and reports to make your own evaluations</li>
- <li>Try out the <a href="tools.html">tools</a> to parse and
- evaluate the metrics data</li>
- </ul>
- <br/>
- <h3>News</h3>
- <ul>
- <li>June 7, 2010: The <a href="exonerator.html">ExoneraTor</a>
- now uses the most recent network information as its data basis
- (as opposed to monthly snapshots). As a by-product,
- <a href="consensus?valid-after=2010-06-01-12-00-00">network
- status consensuses</a> and <a href="serverdesc?desc-id=b7461d591738b4c7d54393acde0efc6d66d1e7fc">server
- descriptors</a> are now browsable by valid-after time and
- descriptor digest, respectively. More sophisticated descriptor
- search functions will follow.</li>
- <li>June 7, 2010: The <a href="torperf-graphs.html">graphs on
- user-experienced download times</a> are now drawn using
- (a modified) <a href="http://had.co.nz/ggplot2/">ggplot2</a>.
- Modifications to ggplot2 include
- <a href="https://stat.ethz.ch/pipermail/r-help/2010-June/241559.html">drawing
- a ribbon only for intervals with non-NA values</a> and
- <a href="https://stat.ethz.ch/pipermail/r-help/2010-June/241618.html">positioning
- the legend at the top of a graph</a>. This concludes the
- transition to ggplot2 and will greatly facilitate dynamic graph
- generation in the future.</li>
- <li>May 26, 2010: The monthly
- <a href="data.html#relaydesc">relay</a> and
- <a href="data.html#bridgedesc">bridge descriptor tarballs</a>
- are now updated every day. Beginning with May 2010, the bridge
- descriptor tarballs do not contain country codes anymore,
- because it was tough to maintain. If your research requires this
- or any other detail, contact us and we'll sort something out.
- <li>May 25, 2010: The
- <a href="bridge-users-graphs.html">graphs on daily bridge users</a>
- are now more
- accurate by excluding broken "geoip-stats" data of 0.2.2.x
- versions and including "bridge-stats" data of bridges running
- 0.2.2.7-alpha or higher.</li>
- <li>May 19, 2010: The graphs on
- <a href="recurring-users-graphs.html">recurring users</a> and
- <a href="bridge-users-graphs.html">bridge users</a> are now
- accompanied by CSV files containing
- <a href="csv/monthly-users-peak.csv">peak</a> and
- <a href="csv/monthly-users-average.csv">average</a>
- daily users per month by country.</li>
- </ul>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>This material is supported in part by the National Science
- Foundation under Grant No. CNS-0959138. Any opinions,
- finding, and conclusions or recommendations expressed in this
- material are those of the author(s) and do not necessarily reflect
- the views of the National Science Foundation.</p>
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/papers.html b/website/papers.html
deleted file mode 100644
index 27a560f..0000000
--- a/website/papers.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Papers</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a class="current">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Papers</h2>
- <br/>
- <p>The <a href="#papers">papers</a> and
- <a href="#techreports">technical reports</a> listed on this page
- originate from, or are based on, work performed in the Tor Metrics
- Project.</p>
- <br/>
- <a id="papers">
- <h3>Papers</h3>
- <br/>
- These papers summarize some of the results of of the Tor Metrics
- Project and have been accepted for publication at academic
- conferences or workshops.
- <ul>
- <li>Karsten Loesing. Measuring the Tor Network from Public
- Directory Information. 2nd Hot Topics in Privacy Enhancing
- Technologies (HotPETs 2009), Seattle, WA, USA, August 2009.
- (<a href="papers/hotpets09.pdf">PDF</a>, 582K)</li>
- <li>Karsten Loesing, Steven J. Murdoch, Roger Dingledine. A Case
- Study on Measuring Statistical Data in the Tor Anonymity
- Network. Accepted for publication at Workshop on Ethics in
- Computer Security Research (WECSR 2010), Tenerife, Spain,
- January 2010. (<a href="papers/wecsr10.pdf">PDF</a>, 160K)</li>
- </ul>
- <br/>
- <a id="techreports">
- <h3>Technical reports</h3>
- <br/>
- The technical reports listed here have been the first place to
- publish novel kinds of statistics on the Tor network. Some, but
- not all, of the results contained in these technical reports have
- been included in the <a href="#papers">papers</a> above or in the
- daily updated <a href="graphs.html">graphs</a>.
- <ul>
- <li>Evaluation of Relays from Public Directory Data
- (<a href="papers/dirarch-2009-06-22.pdf">PDF</a>,
- 558K, last updated on June 22, 2009).</li>
- <li>Analysis of Bridge Usage in Tor
- (<a href="papers/bridges-2009-06-22.pdf">PDF</a>,
- 76K, last updated on June 22, 2009).</li>
- <li>Evaluation of Client Requests to the Directories to
- determine total numbers and countries of users
- (<a href="papers/directory-requests-2009-06-25.pdf">PDF</a>,
- 207K, last updated on June 25, 2009).</li>
- <li>Possible problems of directory authorities assigning Stable
- and Guard flags
- (<a href="papers/relayflags-2009-04-01.pdf">PDF</a>,
- 2M from April 1, 2009).</li>
- <li>Simulation of the number of Fast, Stable, and Guard flags
- for changed requirements
- (<a href="papers/flagrequirements-2009-04-11.pdf">PDF</a>,
- 229K from April 11, 2009).</li>
- <li>Reducing the Circuit Window Size in Tor
- (<a href="papers/circwindow-2009-09-20.pdf">PDF</a>,
- 137K from September 20, 2009).</li>
- <li>Performance of Requests over the Tor Network
- (<a href="papers/torperf-2009-09-22.pdf">PDF</a>,
- 2.8M from September 22, 2009).</li>
- <li>Analysis of Circuit Queues in Tor
- (<a href="papers/bufferstats-2009-08-25.pdf">PDF</a>,
- 196K from August 25, 2009).</li>
- <li>Comparison of GeoIP Databases for Tor
- (<a href="papers/geoipdbcomp-2009-10-23.pdf">PDF</a>,
- 546K from October 23, 2009).</li>
- </ul>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/research.html b/website/research.html
deleted file mode 100644
index 11ffc72..0000000
--- a/website/research.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Research</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a class="current">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Research</h2>
- <br/>
- <p>The Tor Metrics Project aims at supporting privacy enhancing
- technologies research by making <a href="papers.html">papers</a>
- and technical reports, gathered network
- <a href="data.html">data</a>, and <a href="tools.html">tools</a>
- for processing these data available to the public. If you are
- missing anything for your Tor-related research or want to share
- your research results with others, please
- <a href="mailto:tor-assistants at freehaven.net">let us know</a>!
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/status.html b/website/status.html
deleted file mode 100644
index 3288e41..0000000
--- a/website/status.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Status</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a class="current">Status</a>
- <br/>
- <font size="2">
- <a href="exonerator.html">ExoneraTor</a>
- <a href="consensus-health.html">Consensus Health</a>
- <a href="log.html">Last Log</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Status</h2>
- <br/>
- <p>The network data collected by the Tor Metrics Project can be
- used to analyze the Tor network status from a few years ago until
- an hour ago. There are currently two applications for this data:
- The <a href="exonerator.html">ExoneraTor</a> tells you whether
- some IP address was a Tor relay at a given time, and the
- <a href="consensus-health.html">Consensus Health</a> summarizes
- information about the latest network consensus voting process.
- The <a href="log.html">Last Log</a> of the metrics portal software
- execution also falls under this category to evaluate how recent
- and complete the presented data are.
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/tools.html b/website/tools.html
deleted file mode 100644
index 8584b4f..0000000
--- a/website/tools.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Tools</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a class="current">Tools</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Tools</h2>
- <br/>
- <p>This page contains a collection of tools that can be used to
- gather statistics as provided on the <a href="data.html">data</a>
- page and to process the resulting files to generate
- <a href="graphs.html">graphs</a>.</p>
- <ul>
- <li><a href="#ernie">Metrics portal software</a></li>
- <li><a href="#dirarch">Directory-archive script</a></li>
- <li><a href="#bridgesan">Bridge descriptor sanitizer</a></li>
- <li><a href="#torperf">Torperf</a></li>
- </ul>
- <br/>
- <a id="ernie"/>
- <h3>Metrics portal software</h3>
- <br/>
- <p>The <a href="graphs.html">graphs</a> on this website are
- generated using ERNIE, the Enhanced R-based tor Network
- Intelligence Engine (why ERNIE? because nobody liked BIRT; sorry
- for misspelling Tor). ERNIE consists of Java code that parses
- the various input data formats and writes CSV files and R code
- that processes the CSV files to generate graphs. Of course, ERNIE
- can be used to generate customized graphs without the need to put
- them on a website. ERNIE can further import descriptors into a
- database for further analysis and aggregate descriptors to make
- tarballs.</p>
- <ul>
- <li>Browse the
- <a href="http://gitweb.torproject.org//ernie.git">Git repository</a></li>
- <li><tt>git clone git://git.torproject.org/git/ernie</tt></li>
- <li>Read the <a href="ernie-howto.html">HOWTO</a>
- </ul>
- <br/>
- <h3>Directory-archive script</h3>
- <br/>
- <p>The directory-archive script consists of a bunch of shell
- scripts that periodically download relay descriptors, sort them
- into a directory structure, and compile monthly tarballs. The
- tarballs are quite similar to the ones provided on the
- <a href="data.html#relaydesc">data</a> page, with a few
- exceptions: the provided tarballs are the result of combining two
- directory-archive script outputs, splitting v3 votes and v3
- consensuses into separate tarballs and replacing all colons in
- filenames with dashes. The
- <a href="#ernie">metrics portal software</a> contains similar
- functionality.</p>
- <ul>
- <li>Browse the <a href="http://gitweb.torproject.org//tor.git?a=tree;f=contrib/directory-archive;h=095a4216c06b5afc6274eddd39f0238067377fe4;hb=HEAD">contrib/directory-archive/</a> subdirectory in the Tor sources</a></li>
- <li><tt>git clone git://git.torproject.org/git/tor</tt></li>
- </ul>
- <br/>
- <h3>Bridge descriptor sanitizer</h3>
- <br/>
- <p>The bridge authority Tonga maintains a list of bridges in order
- to serve bridge addresses and descriptors to its clients. Every
- half hour, Tonga takes a snapshot of the known bridge descriptors
- and copies them to byblos for later statistical analysis. As a
- guiding principle, the Tor project makes all data that it uses for
- statistical analysis available to the interested public, in order
- to maximize transparency towards the community. However, the
- bridge descriptors contain the IP addresses and other contact
- information of bridges that must not be made public, or the
- purpose of bridges as non-public entry points into the Tor network
- would be obsolete. This script takes the half-hourly snapshots as
- input, removesall possibly sensitive information from the
- descriptors, and puts out the sanitized bridge descriptors that
- are safe to be published. The
- <a href="#ernie">metrics portal software</a> contains similar
- functionality and will soon make this bridge descriptor sanitizer
- obsolete.</p>
- <ul>
- <li>Browse the
- <a href="https://svn.torproject.org/svn/projects/archives/trunk/bridge-desc-sanitizer/">SVN repository</a></li>
- <li><tt>svn co https://svn.torproject.org/svn/projects/archives/trunk/bridge-desc-sanitizer</tt></li>
- </ul>
- <br/>
- <a id="torperf"/>
- <h3>Torperf</h3>
- <br/>
- Torperf is a little tool that measures Tor's performance as users
- experience it. Torperf uses a trivial SOCKS client to download
- files of various sizes over the Tor network and notes how long
- substeps take.</p>
- <ul>
- <li>Browse the
- <a href="https://svn.torproject.org/svn/torperf/trunk/">SVN repository</a></li>
- <li><tt>svn co https://svn.torproject.org/svn/torperf/trunk torperf</tt></li>
- </ul>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
diff --git a/website/torperf-graphs.html b/website/torperf-graphs.html
deleted file mode 100644
index 017a134..0000000
--- a/website/torperf-graphs.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <head>
- <title>Tor Metrics Portal: Time to complete requests</title>
- <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
- <link href="http://www.torproject.org/stylesheet-ltr.css" type=text/css rel=stylesheet>
- <link href="http://www.torproject.org/favicon.ico" type=image/x-icon rel="shortcut icon">
- </head>
- <body>
- <div class="center">
- <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
- <tr>
- <td class="banner-left"><a href="https://www.torproject.org/"><img src="http://www.torproject.org/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
- <td class="banner-middle">
- <a href="/">Home</a>
- <a href="graphs.html">Graphs</a>
- <a href="research.html">Research</a>
- <a href="status.html">Status</a>
- <br/>
- <font size="2">
- <a href="consensus-graphs.html">Network size</a>
- <a href="exit-relays-graphs.html">Exit relays</a>
- <a href="new-users-graphs.html">New users</a>
- <a href="recurring-users-graphs.html">Recurring users</a>
- <a href="bridge-users-graphs.html">Bridge users</a>
- <a class="current">torperf</a>
- <a href="gettor-graphs.html">GetTor</a>
- </font>
- </td>
- <td class="banner-right"></td>
- </tr>
- </table>
- <div class="main-column">
- <h2>Tor Metrics Portal: Graphs</h2>
- <br/>
- <h3>Time to complete requests</h3>
- <br/>
- <p>The following graphs show the performance of the Tor network as
- experienced by its users. The graphs contain the average (median)
- time to request files of three different sizes over the network as
- well as first and third quartile of request times.</p>
- <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p>
- <img src="graphs/torperf/torperf-50kb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-50kb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-50kb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-50kb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-50kb-siv-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-1mb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-1mb-siv-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-12m.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-6m.png"/>
- <img src="graphs/torperf/torperf-5mb-torperf-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-moria-2w.png"/>
- <img src="graphs/torperf/torperf-5mb-siv-2w.png"/>
- <br/>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
- </div>
- </body>
-</html>
-
--
1.7.1
More information about the tor-commits
mailing list