diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-30 18:25:25 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-10-01 18:14:27 -0400 |
commit | f9ea242acabcaec0ab0fbd0de5e9999dfcdb0193 (patch) | |
tree | e57665d063579cf465b6f6be48c5b699c09bd8b2 /doc | |
parent | 45f1e4d5ee7b6e2308655628d18a67d330d9b624 (diff) | |
download | tor-f9ea242acabcaec0ab0fbd0de5e9999dfcdb0193.tar.gz tor-f9ea242acabcaec0ab0fbd0de5e9999dfcdb0193.zip |
Implement node-based router family code
Also, make the NodeFamily option into a list of routersets. This
lets us git rid of router_in_nickname_list (or whatever it was
called) without porting it to work with nodes, and also lets people
specify country codes and IP ranges in NodeFamily
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 42eed6e3dd..90a52fe1ef 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 |