diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-08-26 11:34:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-08-26 11:34:45 -0400 |
| commit | c9203749a2ead39433fa4f62452a2360e0901e42 (patch) | |
| tree | f0d6ff4b9b93f2726134a3033c023ebc0ec6ce8a /src/or/config.c | |
| parent | 707a6bd6595024e0b4a998e0a99eb284499a37e3 (diff) | |
| download | tor-c9203749a2ead39433fa4f62452a2360e0901e42.tar.gz tor-c9203749a2ead39433fa4f62452a2360e0901e42.zip | |
A changelog entry and a bit more documentation for socks-client
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index c5a5b946fe..7944aa1001 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3533,6 +3533,9 @@ options_validate(or_options_t *old_options, or_options_t *options, } } + if (options->Socks4Proxy && options->Socks5Proxy) + REJECT("You cannot specify both Socks4Proxy and SOCKS5Proxy"); + if (options->Socks5ProxyUsername) { size_t len; |