From: David Goulet <dgoulet@torproject.org>
Date: Mon, 25 Sep 2023 12:42:12 +0000 (+0000)
Subject: Merge branch 'ahf/40638' into 'main'
X-Git-Tag: tor-0.4.9.1-alpha~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dec9a6946ff2780bfe212c0f5f74b97ea7c3927f;p=thirdparty%2Ftor.git

Merge branch 'ahf/40638' into 'main'

Handle ntor and ntor_v3 individually in rephist and for MetricsPort.

Closes #40638

See merge request tpo/core/tor!767
---

dec9a6946ff2780bfe212c0f5f74b97ea7c3927f