diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
| commit | 626a8b60d7752f38e6587bed9b614c6d039dd9f7 (patch) | |
| tree | 227f93749508620dc346d2828ade36f47e123517 /doc | |
| parent | e5ca5040a56b74f3d0de82d74946f0d9c7d44cc3 (diff) | |
| parent | ffddd4de2a69a896be3886b8f48a218a70babbcc (diff) | |
| download | tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.tar tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.tar.gz | |
Merge remote-tracking branch 'linus/bug5053-bug5055'
Conflicts:
src/or/geoip.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8245ff419..6c02f45ee 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1458,7 +1458,10 @@ is non-zero): does on behalf of clients. (Default: 1) **GeoIPFile** __filename__:: - A filename containing GeoIP data, for use with BridgeRecordUsageByCountry. + A filename containing IPv4 GeoIP data, for use with by-country statistics. + +**GeoIPv6File** __filename__:: + A filename containing IPv6 GeoIP data, for use with by-country statistics. **CellStatistics** **0**|**1**:: When this option is enabled, Tor writes statistics on the mean time that |