diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-01-23 14:08:47 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-01-23 14:08:47 -0500 |
commit | 6f4ee6e5e78112f78687fa0617e2cdeb2899f7d6 (patch) | |
tree | bf8f6d593863cdeba3d9251e09caa489af5065c4 /src/or/circuituse.c | |
parent | 58f4aee90b753aaa4bca51fd5ffe488fddbef577 (diff) | |
parent | db5b670d85febc6e3011932f8f0c7d383d4b9bea (diff) | |
download | tor-6f4ee6e5e78112f78687fa0617e2cdeb2899f7d6.tar.gz tor-6f4ee6e5e78112f78687fa0617e2cdeb2899f7d6.zip |
Merge remote-tracking branch 'mikeperry/bug24946'
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 2599685964..1ff1de4650 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -135,6 +135,8 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ, } if (purpose == CIRCUIT_PURPOSE_C_GENERAL || + purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || + purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || purpose == CIRCUIT_PURPOSE_HS_VANGUARDS || purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { if (circ->timestamp_dirty && |