torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson
2013-04-13 18:29:25 -04:00
parent 9a4e9b4a80 8aded5b07c
commit 95ccb1e812
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/fix-geoipexclude-doc
+4
View File
@@ -0,0 +1,4 @@
o Documentation fixes:
- Fix the GeoIPExcludeUnknown documentation to refer to ExcludeExitNodes
rather than the currently nonexistent ExcludeEntryNodes. Spotted by
"hamahangi" on tor-talk.
doc/tor.1.txt
+2 -2
View File
@@ -695,10 +695,10 @@ The following options are useful only for clients (that is, if
**GeoIPExcludeUnknown** **0**|**1**|**auto**::
If this option is set to 'auto', then whenever any country code is set in
ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (\{??} and
ExcludeNodes or ExcludeExitNodes, all nodes with unknown country (\{??} and
possibly \{A1}) are treated as excluded as well. If this option is set to
'1', then all unknown countries are treated as excluded in ExcludeNodes
and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't
and ExcludeExitNodes. This option has no effect when a GeoIP file isn't
configured or can't be found. (Default: auto)
**ExitNodes** __node__,__node__,__...__::