Commit 045db909 authored by David Goulet's avatar David Goulet 🐼
Browse files

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

parents c6fb2669 248cbc2d

changes/bug40117

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/feature/rend/rendmid.c

+4 −2
Original line number Diff line number Diff line
@@ -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. */