diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-05 14:34:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 14:34:29 -0400 |
| commit | 73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c (patch) | |
| tree | 4520ec8590003e12db93503b7b5973938b63f2a1 /src/or/relay.c | |
| parent | c0b9f594b65f410cf219673d53226ed4eeeedc19 (diff) | |
| parent | ad9190404b1cbba3f7e17f8db20034e986093f21 (diff) | |
| download | tor-73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c.tar.gz tor-73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c.zip | |
Merge branch 'http_tunnel_squashed'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index e362348bb9..d8f09d320d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1467,8 +1467,9 @@ connection_edge_process_relay_cell_not_open( circuit_log_path(LOG_INFO,LD_APP,TO_ORIGIN_CIRCUIT(circ)); /* don't send a socks reply to transparent conns */ tor_assert(entry_conn->socks_request != NULL); - if (!entry_conn->socks_request->has_finished) + if (!entry_conn->socks_request->has_finished) { connection_ap_handshake_socks_reply(entry_conn, NULL, 0, 0); + } /* Was it a linked dir conn? If so, a dir request just started to * fetch something; this could be a bootstrap status milestone. */ |