[tor-commits] [metrics-web/master] Update from Metrics Timeline, and add links.

[karsten at torproject.org]

commit e54b73882132911fa9ec0809bba0823fb562d6a4
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Sep 15 09:38:32 2020 +0200

    Update from Metrics Timeline, and add links.
---
 src/main/resources/web/json/news.json | 19 ++++++++++++++++---
 src/main/resources/web/jsps/graph.jsp |  4 ++--
 src/main/resources/web/jsps/news.jsp  |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json
index 43c28e8..901b00c 100644
--- a/src/main/resources/web/json/news.json
+++ b/src/main/resources/web/json/news.json
@@ -5,7 +5,7 @@
   "description" : "Shutdown of default obfs4 bridge frosty.",
   "links" : [ {
     "label" : "ticket",
-    "target" : "https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40066"
+    "target" : "https://bugs.torproject.org/tpo/applications/tor-browser-build/40066"
   } ]
 }, {
   "start" : "2020-08-13",
@@ -14,7 +14,7 @@
   "description" : "Deployed version 0.4.1 of the Snowflake WebExtension, with NAT type detection in the browser.",
   "links" : [ {
     "label" : "comment",
-    "target" : "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake-webext/-/issues/13#note_2705805"
+    "target" : "https://bugs.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake-webext/13#note_2705805"
   } ]
 }, {
   "start" : "2020-07-06",
@@ -23,7 +23,7 @@
   "description" : "Deployed NAT-aware matching at the Snowflake broker.",
   "links" : [ {
     "label" : "comment",
-    "target" : "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues/34129#note_2685268"
+    "target" : "https://bugs.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/34129#note_2685268"
   } ]
 }, {
   "start" : "2020-06-30",
@@ -3540,6 +3540,19 @@
     "label" : "commit",
     "target" : "https://gitweb.torproject.org/tor.git/commit/?id=1496056c121d02193433d98173213e52eb3e90a7"
   } ]
+}, {
+  "start" : "2015-12-31",
+  "end" : "2020-06-04",
+  "places" : [ "mx" ],
+  "short_description" : "The Telmex ISP in Mexico blocks seven directory authorities.",
+  "description" : "The Telmex ISP in Mexico blocks seven directory authorities.",
+  "links" : [ {
+    "label" : "mailing list post",
+    "target" : "https://lists.torproject.org/pipermail/tor-relays/2016-January/008491.html"
+  }, {
+    "label" : "article",
+    "target" : "https://globalvoices.org/2020/09/08/we-made-the-largest-mexican-telecommunications-operator-stop-blocking-secure-internet/"
+  } ]
 }, {
   "start" : "2015-12-25",
   "protocols" : [ "meek" ],
diff --git a/src/main/resources/web/jsps/graph.jsp b/src/main/resources/web/jsps/graph.jsp
index 94aa784..8d601e5 100644
--- a/src/main/resources/web/jsps/graph.jsp
+++ b/src/main/resources/web/jsps/graph.jsp
@@ -160,8 +160,8 @@
           <div class="row">
             <div class="col-md-12">
               <h2>Related events</h2>
-              <p>The following events have been manually collected on
-              <a href="https://trac.torproject.org/projects/tor/wiki/doc/MetricsTimeline" target="_blank">this wiki page</a>
+              <p>The following events have been manually collected in the
+              <a href="https://gitlab.torproject.org/tpo/metrics/timeline" target="_blank">metrics-timeline Git repository</a>
               and might be related to the displayed graph.</p>
               <c:if test="${displayEventsNotice}">
               <div class="alert alert-danger">
diff --git a/src/main/resources/web/jsps/news.jsp b/src/main/resources/web/jsps/news.jsp
index abde1e0..d78cde9 100644
--- a/src/main/resources/web/jsps/news.jsp
+++ b/src/main/resources/web/jsps/news.jsp
@@ -19,7 +19,7 @@
         </a>
       </div>
       <h1>News <a href="#news" name="news" class="anchor">#</a></h1>
-      <p>You're a journalist or more generally a person who wants to know what's going on in the Tor network?  We're collecting unusual events in the Tor network together with any insights we have into what we think has happened.</p>
+      <p>You're a journalist or more generally a person who wants to know what's going on in the Tor network?  We're collecting unusual events in the Tor network together with any insights we have into what we think has happened in the <a href="https://gitlab.torproject.org/tpo/metrics/timeline" target="_blank">metrics-timeline Git repository</a>.</p>
     </div>
 
     <c:forEach var="category" items="${news}" varStatus="status">