tor

commit ecbc2e80a0fec4f9cd6a8c1e2dd1bebc3899567a
parent 4d9eb4dd0e67190f8e3bf5300e85611d8605400c
Author: teor <teor@torproject.org>
Date:   Fri,  1 Mar 2019 14:14:26 +1000

Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9

Diffstat:
A
changes/bug25116
 | 
4
++++
M
src/or/circuituse.c
 | 
6
+++---

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/bug25116 b/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;
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
@@ -808,10 +808,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