Browse Source

Merge remote-tracking branch 'dgoulet/bug25116_029_01'

Nick Mathewson 6 years ago
parent
commit
6961609a1c
2 changed files with 7 additions and 3 deletions
  1. 4 0
      changes/bug25116
  2. 3 3
      src/or/circuituse.c

+ 4 - 0
changes/bug25116

@@ -0,0 +1,4 @@
+  o Minor bugfixes (hidden service, heartbeat):
+    - Don't log in the heartbeat any long term established one hop rendezvous
+      points if tor is a single onion service. Fixes bug 25116; bugfix on
+      0.2.9.6-rc;

+ 3 - 3
src/or/circuituse.c

@@ -875,10 +875,10 @@ circuit_log_ancient_one_hop_circuits(int age)
     if (circ->timestamp_created.tv_sec >= cutoff)
       continue;
     /* Single Onion Services deliberately make long term one-hop intro
-     * connections. We only ignore active intro point connections, if we take
-     * a long time establishing, that's worth logging. */
+     * and rendezvous connections. Don't log the established ones. */
     if (rend_service_allow_non_anonymous_connection(options) &&
-        circ->purpose == CIRCUIT_PURPOSE_S_INTRO)
+        (circ->purpose == CIRCUIT_PURPOSE_S_INTRO ||
+         circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED))
       continue;
     /* Tor2web deliberately makes long term one-hop rend connections,
      * particularly when Tor2webRendezvousPoints is used. We only ignore