summaryrefslogtreecommitdiff
path: root/tor.cc
diff options
context:
space:
mode:
authorTim Retout <tim@retout.co.uk>2014-04-20 15:37:27 +0100
committerTim Retout <tim@retout.co.uk>2014-04-20 15:37:27 +0100
commit698a7462be62528ec42eeb7dbc779686e698b50e (patch)
tree803a068626375ccd74423f44beacb8a35609992f /tor.cc
parent3c2edc4a92bd373d384a9c025c193fe3084e9704 (diff)
Add stream isolation, and document Acquire::tor::proxy
Diffstat (limited to 'tor.cc')
-rw-r--r--tor.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/tor.cc b/tor.cc
index c764840..9741f3e 100644
--- a/tor.cc
+++ b/tor.cc
@@ -118,7 +118,11 @@ void HttpsMethod::SetupProxy() /*{{{*/
if (UseProxy.empty() == true)
{
- UseProxy = "socks5h://localhost:9050";
+ // Default proxy
+ // - socks5h (actually ignored below) - use proxy for DNS resolution
+ // - apt:apt@ - dummy socks authentication (for IsolateSOCKSAuth in Tor)
+ // - localhost:9050 - default Tor SOCKS port
+ UseProxy = "socks5h://apt:apt@localhost:9050";
}
// Determine what host and port to use based on the proxy settings