[tor-commits] [metrics-web/master] Add @type annotation for HS v3.

[karsten@xxxxxxxxxxxxxx]

commit 66a657078b697e719cd9f5863fef62bdcb4d890a
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Mon Nov 4 12:24:38 2019 +0100

    Add @type annotation for HS v3.
    
    Also update to latest metrics-base/-lib.
    
    Implements #31481.
---
 src/build                                 |  2 +-
 src/main/resources/web/jsps/collector.jsp | 18 ++++++++++++++++++
 src/submods/metrics-lib                   |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/build b/src/build
index 62a964a..eb16cb3 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47
+Subproject commit eb16cb359db41722e6089bafb1e26808df4338df
diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp
index 102bcab..3bb0768 100644
--- a/src/main/resources/web/jsps/collector.jsp
+++ b/src/main/resources/web/jsps/collector.jsp
@@ -152,6 +152,11 @@
   <td><code>@type hidden-service-descriptor 1.0</code></td>
   <td></td>
 </tr>
+<tr>
+  <td><a href="#type-hidden-service-descriptor-3">Hidden Service Descriptors v3</a></td>
+  <td><code>@type hidden-service-descriptor-3 1.0</code></td>
+  <td></td>
+</tr>
 <tr class="tableHeadline">
   <td colspan="3"><b><a href="#bridge-pool-assignments">BridgeDB's Bridge Pool Assignments</a></b></td>
 </tr>
@@ -553,6 +558,19 @@ Despite the version number being 1.0, these descriptors are part of the
 version 2 hidden service protocol.
 </p>
 
+<h3 id="type-hidden-service-descriptor-3" class="hover">Hidden Service Descriptors v3
+<small><code>@type hidden-service-descriptor-3 1.0</code></small>
+<a href="#type-hidden-service-descriptor-3" class="anchor">#</a>
+</h3>
+
+<p>
+Hidden service descriptors contain details required to connect to version
+3 hidden service.
+Despite the version number being 1.0, these descriptors are part of the
+<a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt";>version
+3 hidden service protocol</a>.
+</p>
+
 <br>
 <h2 id="bridge-pool-assignments" class="hover">BridgeDB's Bridge Pool Assignments
 <a href="#bridge-pool-assignments" class="anchor">#</a>
diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib
index 8e2f671..8763af4 160000
--- a/src/submods/metrics-lib
+++ b/src/submods/metrics-lib
@@ -1 +1 @@
-Subproject commit 8e2f67107f1e6add0db3fa209cb89c3b69f7bf06
+Subproject commit 8763af44465445b2257f9740d4ce341f8334eead

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits