diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-13 16:04:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-13 16:04:25 -0400 |
| commit | 8c837db38f5b2015dd579de8d8df580f51d133bc (patch) | |
| tree | 8a67afb20b2b998fa20b11c522acf1cb3cd634c6 /doc | |
| parent | cbda016bc5f588351900433835bca912efeb41c4 (diff) | |
| parent | c9dece14ae7d9c14c17df6685f7504c23eb65899 (diff) | |
| download | tor-8c837db38f5b2015dd579de8d8df580f51d133bc.tar.gz tor-8c837db38f5b2015dd579de8d8df580f51d133bc.zip | |
Merge branch 'nodes'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/nodefamily_routerset | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/nodefamily_routerset b/doc/nodefamily_routerset new file mode 100644 index 0000000000..0af62e11f6 --- /dev/null +++ b/doc/nodefamily_routerset @@ -0,0 +1,4 @@ + o Minor features + - The NodeFamily option -- which let you declare that you want to + consider nodes to be part of a family whether they list themselves + that way or not -- now allows IP address ranges and country codes. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 28f5a4288d..8660fcb8f1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -571,7 +571,8 @@ The following options are useful only for clients (that is, if constitute a "family" of similar or co-administered servers, so never use any two of them in the same circuit. Defining a NodeFamily is only needed when a server doesn't list the family itself (with MyFamily). This option - can be used multiple times. + can be used multiple times. In addition to nodes, you can also list + IP address and ranges and country codes in {curly braces}. **EnforceDistinctSubnets** **0**|**1**:: If 1, Tor will not put two servers whose IP addresses are "too close" on |