diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
| commit | 1b63eea66cbb8793a3cff05de8d856ce3b93fc17 (patch) | |
| tree | 2cf4f6ff12522ed24a610b3acab0b107f73b1977 /src/core/or/or.h | |
| parent | 9276c07a916e4dc3b159c95c578e43be102f26e6 (diff) | |
| parent | 14d781fff6bd88c4e0cd5b741629c3e79c8612d9 (diff) | |
| download | tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.tar.gz tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.zip | |
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
Diffstat (limited to 'src/core/or/or.h')
| -rw-r--r-- | src/core/or/or.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/or/or.h b/src/core/or/or.h index 4d6afc2b0b..3b9955755d 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -167,12 +167,13 @@ struct curve25519_public_key_t; #define PROXY_CONNECT 1 #define PROXY_SOCKS4 2 #define PROXY_SOCKS5 3 -/* !!!! If there is ever a PROXY_* type over 3, we must grow the proxy_type +#define PROXY_HAPROXY 4 +/* !!!! If there is ever a PROXY_* type over 7, we must grow the proxy_type * field in or_connection_t */ /* Pluggable transport proxy type. Don't use this in or_connection_t, * instead use the actual underlying proxy type (see above). */ -#define PROXY_PLUGGABLE 4 +#define PROXY_PLUGGABLE 5 /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ |