diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-07-12 11:47:25 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-07-12 11:47:25 -0400 |
commit | 7556933537b5777a9bef21230bb91a08aa70d60e (patch) | |
tree | a23d84b861cd801d1c805804efc3cd1881252582 /src/core/or/socks_request_st.h | |
parent | 0317eb143ec6869e5a27c1ffc6d3d89be4c35c32 (diff) | |
parent | ba3121191b59ea254e3ebab697430bdc03857b6d (diff) | |
download | tor-7556933537b5777a9bef21230bb91a08aa70d60e.tar.gz tor-7556933537b5777a9bef21230bb91a08aa70d60e.zip |
Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged
Diffstat (limited to 'src/core/or/socks_request_st.h')
-rw-r--r-- | src/core/or/socks_request_st.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/socks_request_st.h b/src/core/or/socks_request_st.h index d7b979c3eb..17b668e179 100644 --- a/src/core/or/socks_request_st.h +++ b/src/core/or/socks_request_st.h @@ -70,6 +70,8 @@ struct socks_request_t { /** The negotiated password value if any (for socks5). This value is NOT * nul-terminated; see passwordlen for its length. */ char *password; + + uint8_t socks5_atyp; /* SOCKS5 address type */ }; #endif |