diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-08 08:02:28 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-08 08:02:28 -0400 |
| commit | 3885e7b44b1df421aa062ba2598f1731e4e3e3a5 (patch) | |
| tree | cce263fac0f44bc8994ae1ead9cee534e19a7afb /src/core/mainloop | |
| parent | b72f5da03d12e0ac2212d18e3dea309d23ded79c (diff) | |
| parent | e9769d621769c2ee31657b6da25032d86f79b15d (diff) | |
| download | tor-3885e7b44b1df421aa062ba2598f1731e4e3e3a5.tar.gz tor-3885e7b44b1df421aa062ba2598f1731e4e3e3a5.zip | |
Merge branch 'tor-github/pr/1000'
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index b9d1b95c2a..8ec21b5c8e 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -82,6 +82,7 @@ #include "core/or/policies.h" #include "core/or/reasons.h" #include "core/or/relay.h" +#include "core/or/crypt_path.h" #include "core/proto/proto_http.h" #include "core/proto/proto_socks.h" #include "feature/client/dnsserv.h" @@ -5330,7 +5331,7 @@ assert_connection_ok(connection_t *conn, time_t now) tor_assert(entry_conn->socks_request->has_finished); if (!conn->marked_for_close) { tor_assert(ENTRY_TO_EDGE_CONN(entry_conn)->cpath_layer); - assert_cpath_layer_ok(ENTRY_TO_EDGE_CONN(entry_conn)->cpath_layer); + cpath_assert_layer_ok(ENTRY_TO_EDGE_CONN(entry_conn)->cpath_layer); } } } |