[tor-commits] [tor/master] circuit: Consider v3 hidden service circuit in circuit_expire_building()

[nickm at torproject.org]

commit e546ac6b32d5478f50644ca8f1eac0a66513fe8d
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 24 09:31:30 2017 -0400

    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 at torproject.org>
---
 src/or/circuituse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 2472ac545..570b05e57 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;