nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.3

Browse Source
This commit is contained in:
David Goulet 2021-01-28 12:02:43 -05:00
commit ab58dd1577
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug40117 Normal file
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.

6
src/feature/rend/rendmid.c
View File

@ -343,10 +343,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
goto err; goto err;
} }
/* Statistics: Mark this circuit as an RP circuit so that we collect /* Statistics: Mark circuits as RP circuits */
stats from it. */
if (options->HiddenServiceStatistics) { if (options->HiddenServiceStatistics) {
/* `circ` is the RP <-> service circuit */
circ->circuit_carries_hs_traffic_stats = 1; 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. */ /* Send the RENDEZVOUS2 cell to the client. */