aboutsummaryrefslogtreecommitdiff
path: root/src/feature/rend/rendmid.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-01-28 12:02:43 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-01-28 12:02:43 -0500
commitab58dd15774382689dd0c2a003d1a3dbaf2d9b5d (patch)
treef490c85967c8800e7aee6e4abd83645b8b95c324 /src/feature/rend/rendmid.c
parent7ae74203e13de85d52fdde16ffaf06e2366c8944 (diff)
parent8f13257ccd99772473949200e72e90ba2dd419a1 (diff)
downloadtor-ab58dd15774382689dd0c2a003d1a3dbaf2d9b5d.tar.gz
tor-ab58dd15774382689dd0c2a003d1a3dbaf2d9b5d.zip
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'src/feature/rend/rendmid.c')
-rw-r--r--src/feature/rend/rendmid.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index a473f0c7e1..b497362857 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -343,10 +343,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
goto err;
}
- /* Statistics: Mark this circuit as an RP circuit so that we collect
- stats from it. */
+ /* Statistics: Mark circuits as RP circuits */
if (options->HiddenServiceStatistics) {
+ /* `circ` is the RP <-> service circuit */
circ->circuit_carries_hs_traffic_stats = 1;
+ /* `rend_circ` is the client <-> RP circuit */
+ rend_circ->circuit_carries_hs_traffic_stats = 1;
}
/* Send the RENDEZVOUS2 cell to the client. */