Commit 8294cf11 authored by Georg Koppen's avatar Georg Koppen Committed by Hiro
Browse files

Fix bridgedb-metrics entry on collector.html

parent 2624ebd4

src/main/python/fallback_dir.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import json 
import re

import urllib.request



response = urllib.request.urlopen("https://gitweb.torproject.org/tor.git/plain/src/app/config/fallback_dirs.inc")

response = urllib.request.urlopen("https://gitlab.torproject.org/tpo/core/tor/-/raw/HEAD/src/app/config/fallback_dirs.inc")

lines = [x.decode("ascii") for x in response.readlines()]



fingerprints = []

src/main/resources/spec/bridge-descriptors.xml

+4 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ 
      the document format of (non-sanitized) server descriptors as much as

      possible.

      Also refer to the

      <eref target="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">

      <eref target="https://spec.torproject.org/dir-spec">

      Tor directory protocol, version 3 specification</eref>, as the following

      sections only specify items that differ from their non-sanitized counterparts.</t>

      <section title="Annotations">
@@ -480,7 +480,7 @@ 
      same approach as sanitized server descriptors by changing as few items as

      possible in their original, non-sanitized counterpart.

      The original format is specified in the

      <eref target="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor

      <eref target="https://spec.torproject.org/dir-spec">Tor

      directory protocol, version 3</eref>.

      Only the changes to that specification are listed below.</t>

      <section title="Annotations">
@@ -591,7 +591,7 @@ 
    <section title="Network status document format">

      <t>The document format of bridge network statuses is loosely based on the

      network status format specified in the

      <eref target="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt">Tor

      <eref target="https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/rend-spec-v2.txt">Tor

      directory protocol, version 2</eref>.

      However, the preamble of bridge network statuses contains far fewer items

      than that of (relay) network statuses, and the ones that are similar
@@ -633,7 +633,7 @@ 
          directory authority had at the moment it was forming a status, which

          are left unchanged in the sanitizing process.

          This item was first introduced in

          <eref target="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor

          <eref target="https://spec.torproject.org/dir-spec">Tor

          directory protocol, version 3</eref>.</t>

        </list>

        </t>

src/main/resources/web/json/categories.json

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
    "icon": "fa-dashboard",

    "header": "Performance",

    "summary": "How fast and reliable the Tor network is.",

    "description": "We use <a href=\"https://gitweb.torproject.org/torperf.git\">Torperf</a> and <a href=\"https://gitlab.torproject.org/tpo/network-health/metrics/onionperf\">OnionPerf</a> to run performance measurements. Both work by fetching files of different sizes over Tor and measuring how long that takes.",

    "description": "We use <a href=\"https://gitlab.torproject.org/tpo/network-health/metrics/torperf\">Torperf</a> and <a href=\"https://gitlab.torproject.org/tpo/network-health/metrics/onionperf\">OnionPerf</a> to run performance measurements. Both work by fetching files of different sizes over Tor and measuring how long that takes.",

    "metrics": [

      "torperf",

      "torperf-failures",

src/main/resources/web/json/metrics.json

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    "id": "versions",

    "title": "Relays by tor version",

    "type": "Graph",

    "description": "<p>This graph shows the number of running <a href=\"glossary.html#relay\">relays</a> by tor software version.  Relays report their tor software version when they announce themselves in the network.  New major versions are added to the graph as soon as they are first recommended by the directory authorities.  More details on when these versions were declared stable or unstable can be found on the <a href=\"https://www.torproject.org/download/download.html\">download page</a> and in the <a href=\"https://gitweb.torproject.org/tor.git/tree/ChangeLog\">changes file</a>.</p>",

    "description": "<p>This graph shows the number of running <a href=\"glossary.html#relay\">relays</a> by tor software version.  Relays report their tor software version when they announce themselves in the network.  New major versions are added to the graph as soon as they are first recommended by the directory authorities.  More details on when these versions were declared stable or unstable can be found on the <a href=\"https://www.torproject.org/download/download.html\">download page</a> and in the <a href=\"https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog\">changes file</a>.</p>",

    "function": "versions",

    "parameters": [

      "start",

src/main/resources/web/jsps/bridge-descriptors.jsp

+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ of sanitized bridge descriptors. These descriptors are based on 
original, non-sanitized bridge descriptors after sanitizing any

parts that would make it easier to enumerate bridges. Unless stated

otherwise, the <a href=

"https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n193">document

"https://spec.torproject.org/dir-spec/outline.html#metaformat">document

meta-format</a> of the Tor directory protocol, version 3 is

used.</p>

</div>
@@ -378,7 +378,7 @@ descriptor document format</a></h2> 
<p>The document format of sanitized bridge server descriptors

resembles the document format of (non-sanitized) server descriptors

as much as possible. Also refer to the <a href=

"https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor

"https://spec.torproject.org/dir-spec">Tor

directory protocol, version 3 specification</a>, as the following

sections only specify items that differ from their non-sanitized

counterparts.</p>
@@ -648,7 +648,7 @@ descriptor document format</a></h2> 
the same approach as sanitized server descriptors by changing as

few items as possible in their original, non-sanitized counterpart.

The original format is specified in the <a href=

"https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor

"https://spec.torproject.org/dir-spec">Tor

directory protocol, version 3</a>. Only the changes to that

specification are listed below.</p>

</div>
@@ -793,7 +793,7 @@ status document format</a></h2> 
<div id="rfc.section.6.p.1">

<p>The document format of bridge network statuses is loosely based

on the network status format specified in the <a href=

"https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt">

"https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/rend-spec-v2.txt">

Tor directory protocol, version 2</a>. However, the preamble of

bridge network statuses contains far fewer items than that of

(relay) network statuses, and the ones that are similar differ in
@@ -852,7 +852,7 @@ left unchanged in the sanitizing process.</li> 
directory authority had at the moment it was forming a status,

which are left unchanged in the sanitizing process. This item was

first introduced in <a href=

"https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor

"https://spec.torproject.org/dir-spec">Tor

directory protocol, version 3</a>.</li>

</ul>

</div>