summaryrefslogtreecommitdiff
path: root/doc/spec/address-spec.txt
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-08-03 15:34:28 +0000
committerRoger Dingledine <arma@torproject.org>2008-08-03 15:34:28 +0000
commit449174d796930b7bcb4269c012d9251ca2140ad8 (patch)
tree734a3faf774853e1f12c53e4f693828adc668f36 /doc/spec/address-spec.txt
parent44536fddbc34c10a570f2799dc707e7511c432ad (diff)
downloadtor-449174d796930b7bcb4269c012d9251ca2140ad8.tar.gz
tor-449174d796930b7bcb4269c012d9251ca2140ad8.zip
update and integrate proposals 125 (bridges) and 137 (bootstrap status)
svn:r16374
Diffstat (limited to 'doc/spec/address-spec.txt')
-rw-r--r--doc/spec/address-spec.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/spec/address-spec.txt b/doc/spec/address-spec.txt
index 966f34c3d9..2a84d857e6 100644
--- a/doc/spec/address-spec.txt
+++ b/doc/spec/address-spec.txt
@@ -5,10 +5,11 @@ $Id$
1. Overview
- Most of the time, Tor treats user-specified hostnames as opaque: When the
- user connects to www.torproject.org, Tor picks an exit node and uses that node to
- connect to "www.torproject.org". Some hostnames, however, can be used to override
- Tor's default behavior and circuit-building rules.
+ Most of the time, Tor treats user-specified hostnames as opaque: When
+ the user connects to www.torproject.org, Tor picks an exit node and uses
+ that node to connect to "www.torproject.org". Some hostnames, however,
+ can be used to override Tor's default behavior and circuit-building
+ rules.
These hostnames can be passed to Tor as the address part of a SOCKS4a or
SOCKS5 request. If the application is connected to Tor using an IP-only