diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 11:09:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 11:09:54 -0400 |
| commit | 77e678c20daf8633ce1904dd1df28398d820f7c0 (patch) | |
| tree | 411cb587ea7533b65edf60c8bc2221b072dda807 /src/or/connection_or.c | |
| parent | a01b4d7f87f2217f55f5c5113fe19a2d3081a44c (diff) | |
| parent | 518ebe14dcc7568da353c4c517039d0c621deb28 (diff) | |
| download | tor-77e678c20daf8633ce1904dd1df28398d820f7c0.tar.gz tor-77e678c20daf8633ce1904dd1df28398d820f7c0.zip | |
Merge remote-tracking branch 'github/shrink_or_h_more'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 9692e5d676..b3021edf16 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -66,8 +66,12 @@ #include "or/or_connection_st.h" #include "or/or_handshake_certs_st.h" #include "or/or_handshake_state_st.h" +#include "or/or_state_st.h" #include "or/routerinfo_st.h" #include "or/var_cell_st.h" +#include "lib/crypt_ops/crypto_format.h" + +#include "lib/tls/tortls.h" static int connection_tls_finish_handshake(or_connection_t *conn); static int connection_or_launch_v3_or_handshake(or_connection_t *conn); @@ -2990,4 +2994,3 @@ connection_or_send_authenticate_cell,(or_connection_t *conn, int authtype)) return 0; } - |