aboutsummaryrefslogtreecommitdiff
path: root/src/feature/rend
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-09-08 11:14:12 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-09-08 11:14:12 -0400
commit12c758312651c09eb68e9f4e04a7fd3ad9c3a811 (patch)
treefa7877965e81bca780765e5aab623e2c30e9e5d2 /src/feature/rend
parentae6430818ee2786e2764bd6286aed311cdd77ab2 (diff)
parent85a1e6c6018153f76afe175e51e0199dd2651678 (diff)
downloadtor-12c758312651c09eb68e9f4e04a7fd3ad9c3a811.tar.gz
tor-12c758312651c09eb68e9f4e04a7fd3ad9c3a811.zip
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/feature/rend')
-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. */