From: David Goulet <dgoulet@torproject.org>
Date: Thu, 24 Aug 2017 13:31:30 +0000 (-0400)
Subject: circuit: Consider v3 hidden service circuit in circuit_expire_building()
X-Git-Tag: tor-0.3.2.1-alpha~146^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e546ac6b32d5478f50644ca8f1eac0a66513fe8d;p=thirdparty%2Ftor.git

circuit: Consider v3 hidden service circuit in circuit_expire_building()

For a ready v3 rendezvous circuit, consider it so we don't expire.

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 2472ac5452..570b05e572 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -651,6 +651,7 @@ circuit_expire_building(void)
            * because that's set when they switch purposes
            */
           if (TO_ORIGIN_CIRCUIT(victim)->rend_data ||
+              TO_ORIGIN_CIRCUIT(victim)->hs_ident ||
               victim->timestamp_dirty > cutoff.tv_sec)
             continue;
           break;