diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-19 13:25:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 13:25:45 -0400 |
| commit | c101ecc8dcc733fda31c0834f19c48d717ebe4c7 (patch) | |
| tree | 53cbcd8c6b4290bd7d8c78fd2f58e791241864ab /src/or/or.h | |
| parent | 6e94d2fb3a11d7cba5796c1662e0c5089ad3e509 (diff) | |
| parent | 9bdd33eae68b93db688c4537e5c11841a5d37a3b (diff) | |
| download | tor-c101ecc8dcc733fda31c0834f19c48d717ebe4c7.tar.gz tor-c101ecc8dcc733fda31c0834f19c48d717ebe4c7.zip | |
Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'
Conflicts:
src/common/util.c
src/or/entrynodes.h
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 08b32d5ec3..2b9d2b4d67 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -238,7 +238,9 @@ typedef enum { #define PROXY_SOCKS5 3 /* !!!! If there is ever a PROXY_* type over 2, we must grow the proxy_type * field in or_connection_t */ -/* pluggable transports proxy type */ + +/* 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 /* Proxy client handshake states */ |