Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5

This commit is contained in:
David Goulet
2021-01-28 12:08:14 -05:00
2 changed files with 9 additions and 2 deletions
+5
View File
@@ -0,0 +1,5 @@
o Major bugfixes (stats, onion services):
- Fix a bug where we were undercounting the Tor network's total onion
service traffic, by only counting rendezvous traffic originating from
services and ignoring any traffic originating from clients. Fixes bug
40117; bugfix on 0.2.6.2-alpha.
+4 -2
View File
@@ -333,10 +333,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. */