diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-10-26 17:04:58 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-10-26 17:04:58 +0200 |
| commit | 07f2a06c6190696cf47b8e42476bb70b11083f15 (patch) | |
| tree | d83ce58232475bdc73225f9d85147890df47ab1e /src/core/or/circuituse.c | |
| parent | f43fe890dd7987811c1ce2b9d91404b27c965f6a (diff) | |
| parent | 05242f5555ceb276dd945f9d43a37dbe3d5d875b (diff) | |
| download | tor-07f2a06c6190696cf47b8e42476bb70b11083f15.tar.gz tor-07f2a06c6190696cf47b8e42476bb70b11083f15.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/169' into master
Diffstat (limited to 'src/core/or/circuituse.c')
| -rw-r--r-- | src/core/or/circuituse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 9b506e67a1..ace68cea53 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2693,7 +2693,8 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, apconn->may_use_optimistic_data = 0; log_info(LD_APP, "Looks like completed circuit to %s %s allow " "optimistic data for connection to %s", - circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL ? + (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_CONTROLLER) ? /* node_describe() does the right thing if exitnode is NULL */ safe_str_client(node_describe(exitnode)) : "hidden service", |