[or-cvs] [metrics-web/master] Fix tor-assistants address as pointed out by phobos.
karsten at torproject.org
karsten at torproject.org
Mon Dec 27 14:04:46 UTC 2010
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon, 27 Dec 2010 15:01:50 +0100
Subject: Fix tor-assistants address as pointed out by phobos.
Commit: 5a749ffeb4dbc03ed5fdfd4350e641eb276af20f
---
.../torproject/ernie/web/DescriptorServlet.java | 6 +++---
.../torproject/ernie/web/ExoneraTorServlet.java | 4 ++--
src/org/torproject/ernie/web/RelayServlet.java | 6 +++---
web/WEB-INF/error.jsp | 2 +-
web/WEB-INF/relay-search.jsp | 2 +-
web/WEB-INF/research.jsp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/org/torproject/ernie/web/DescriptorServlet.java b/src/org/torproject/ernie/web/DescriptorServlet.java
index cc32de6..c291ef7 100644
--- a/src/org/torproject/ernie/web/DescriptorServlet.java
+++ b/src/org/torproject/ernie/web/DescriptorServlet.java
@@ -164,7 +164,7 @@ public class DescriptorServlet extends HttpServlet {
+ "experienced an unknown database problem while looking up "
+ "descriptors with identifier starting with " + descId
+ ". If this problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
@@ -221,7 +221,7 @@ public class DescriptorServlet extends HttpServlet {
out.write("<br/><p><font color=\"red\"><b>Warning: </b></font>"
+ "Internal server error when looking up descriptor. If this "
+ "problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
@@ -294,7 +294,7 @@ public class DescriptorServlet extends HttpServlet {
+ "experienced an unknown database problem while looking up "
+ "the network status consensuses referencing descriptor "
+ descId + ". If this problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
}
diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java
index e04619f..35e292d 100644
--- a/src/org/torproject/ernie/web/ExoneraTorServlet.java
+++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java
@@ -157,7 +157,7 @@ public class ExoneraTorServlet extends HttpServlet {
out.println("<p><font color=\"red\"><b>Warning: </b></font>This "
+ "server doesn't have any relay lists available. If this "
+ "problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
@@ -386,7 +386,7 @@ public class ExoneraTorServlet extends HttpServlet {
+ relayIP + " at " + timestampStr + "! We "
+ "did not find any relevant relay lists preceding the given "
+ "time. If you think this is an error on our side, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">contact "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">contact "
+ "us</a>!</p>\n");
writeFooter(out);
return;
diff --git a/src/org/torproject/ernie/web/RelayServlet.java b/src/org/torproject/ernie/web/RelayServlet.java
index eb9df72..78ad7b6 100644
--- a/src/org/torproject/ernie/web/RelayServlet.java
+++ b/src/org/torproject/ernie/web/RelayServlet.java
@@ -178,7 +178,7 @@ public class RelayServlet extends HttpServlet {
+ "experienced an unknown database problem while looking up "
+ "the relay with fingerprint starting with "
+ fingerprintParameter + ". If this problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
@@ -269,7 +269,7 @@ public class RelayServlet extends HttpServlet {
+ "the relay with fingerprint "
+ (fingerprintParameter.length() < 40 ? "starting with " : "")
+ fingerprintParameter + ". If this problem persists, please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
@@ -317,7 +317,7 @@ public class RelayServlet extends HttpServlet {
+ "Internal server error when looking up descriptor. The "
+ "query was '" + query + "'. If this problem persists, "
+ "please "
- + "<a href=\"mailto:tor-assistants at freehaven.net\">let us "
+ + "<a href=\"mailto:tor-assistants at torproject.org\">let us "
+ "know</a>!</p>\n");
writeFooter(out);
return;
diff --git a/web/WEB-INF/error.jsp b/web/WEB-INF/error.jsp
index 3c713a3..5737dc3 100644
--- a/web/WEB-INF/error.jsp
+++ b/web/WEB-INF/error.jsp
@@ -64,7 +64,7 @@ Maybe you find what you're looking for on our sitemap:
</p>
<p>If this problem persists, please
-<a href="mailto:tor-assistants at freehaven.net">let us know</a>!</p>
+<a href="mailto:tor-assistants at torproject.org">let us know</a>!</p>
</div>
</div>
diff --git a/web/WEB-INF/relay-search.jsp b/web/WEB-INF/relay-search.jsp
index 2108cfe..0741aca 100644
--- a/web/WEB-INF/relay-search.jsp
+++ b/web/WEB-INF/relay-search.jsp
@@ -68,7 +68,7 @@
<c:if test="${queryTime > 10000}">
<p>In theory, search time should not exceed 10 seconds. The
query was '${query}'. If this or similar searches remain slow,
- please <a href="mailto:tor-assistants at freehaven.net">let us
+ please <a href="mailto:tor-assistants at torproject.org">let us
know</a>!</p>
</c:if>
</c:if>
diff --git a/web/WEB-INF/research.jsp b/web/WEB-INF/research.jsp
index 257cc21..4a78a0e 100644
--- a/web/WEB-INF/research.jsp
+++ b/web/WEB-INF/research.jsp
@@ -20,7 +20,7 @@
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>!
+ <a href="mailto:tor-assistants at torproject.org">let us know</a>!
</div>
</div>
<div class="bottom" id="bottom">
--
1.7.1
More information about the tor-commits
mailing list