summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-26 11:34:45 -0400
committerNick Mathewson <nickm@torproject.org>2009-08-26 11:34:45 -0400
commitc9203749a2ead39433fa4f62452a2360e0901e42 (patch)
treef0d6ff4b9b93f2726134a3033c023ebc0ec6ce8a /src/or/or.h
parent707a6bd6595024e0b4a998e0a99eb284499a37e3 (diff)
downloadtor-c9203749a2ead39433fa4f62452a2360e0901e42.tar.gz
tor-c9203749a2ead39433fa4f62452a2360e0901e42.zip
A changelog entry and a bit more documentation for socks-client
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/or/or.h b/src/or/or.h
index df57f3048d..1aa40af61b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2392,15 +2392,15 @@ typedef struct {
uint16_t HttpsProxyPort; /**< Parsed port for https proxy, if any. */
char *HttpsProxyAuthenticator; /**< username:password string, if any. */
- char *Socks4Proxy;
- tor_addr_t Socks4ProxyAddr;
- uint16_t Socks4ProxyPort;
-
- char *Socks5Proxy;
- tor_addr_t Socks5ProxyAddr;
- uint16_t Socks5ProxyPort;
- char *Socks5ProxyUsername;
- char *Socks5ProxyPassword;
+ char *Socks4Proxy; /**< hostname:port to use as a SOCKS4 proxy, if any. */
+ tor_addr_t Socks4ProxyAddr; /**< Derived from Socks4Proxy. */
+ uint16_t Socks4ProxyPort; /**< Derived from Socks4Proxy. */
+
+ char *Socks5Proxy; /**< hostname:port to use as a SOCKS5 proxy, if any. */
+ tor_addr_t Socks5ProxyAddr; /**< Derived from Sock5Proxy. */
+ uint16_t Socks5ProxyPort; /**< Derived from Socks5Proxy. */
+ char *Socks5ProxyUsername; /**< Username for SOCKS5 authentication, if any */
+ char *Socks5ProxyPassword; /**< Password for SOCKS5 authentication, if any */
/** List of configuration lines for replacement directory authorities.
* If you just want to replace one class of authority at a time,