[tor-commits] [tor/release-0.2.9] Make circuit_log_ancient_one_hop_circuits() ignore established service rendezvous

[teor at torproject.org]

commit 7ce8d5513ba388259e4e251d49183ef0fe9c8fa8
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Feb 5 10:52:17 2018 -0500

    Make circuit_log_ancient_one_hop_circuits() ignore established service rendezvous
    
    Services can keep rendezvous circuits for a while so don't log them if tor is
    a single onion service.
    
    Fixes #25116
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/bug25116    | 4 ++++
 src/or/circuituse.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changes/bug25116 b/changes/bug25116
new file mode 100644
index 000000000..b3e73feea
--- /dev/null
+++ 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
index 84574cd5b..96cd3cd7e 100644
--- 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