summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Hogan <robert@webkit.org>2010-08-02 20:09:37 +0100
committerNick Mathewson <nickm@torproject.org>2011-11-30 14:08:10 -0500
commitc6d8c6baaa983aecd6a5121ec6ed8e2d9a2a24be (patch)
tree13d787d18ee6364c390523af40450268e1fc13e6 /doc
parentd3ff167e098fa44e4ec30c7e6f50127a8c99dae7 (diff)
downloadtor-c6d8c6baaa983aecd6a5121ec6ed8e2d9a2a24be.tar.gz
tor-c6d8c6baaa983aecd6a5121ec6ed8e2d9a2a24be.zip
bug933 - Match against super-domains in MapAddress
Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 4edee80cea..4d4ad9fdb7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -659,7 +659,12 @@ The following options are useful only for clients (that is, if
before processing it. For example, if you always want connections to
www.indymedia.org to exit via __torserver__ (where __torserver__ is the
nickname of the server), use "MapAddress www.indymedia.org
- www.indymedia.org.torserver.exit".
+ www.indymedia.org.torserver.exit". If the value is prepended with a \'.\',
+ it is treated as matching an entire domain.For example, if you always
+ want connections to any sub-domain of indymedia.org to exit via
+ __torserver__ (where __torserver__ is the nickname of the server), use
+ "MapAddress .indymedia.org .torserver.exit". (Note the leading '.' in
+ each part of the directive.)
**NewCircuitPeriod** __NUM__::
Every NUM seconds consider whether to build a new circuit. (Default: 30