aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-02-12 20:20:52 +0000
committerNick Mathewson <nickm@torproject.org>2008-02-12 20:20:52 +0000
commitf3eaeb99a3e3f11d3227778f4a0191c923df992b (patch)
treea9fed8c6e04bffc5d2649f71568099403af69978 /doc
parentdc94b1a226c21b5ac337d79f51bc10cd91b42e04 (diff)
downloadtor-f3eaeb99a3e3f11d3227778f4a0191c923df992b.tar.gz
tor-f3eaeb99a3e3f11d3227778f4a0191c923df992b.zip
r18051@catbus: nickm | 2008-02-12 15:20:43 -0500
Re-tune mempool parametes based on testing on peacetime: use smaller chuncks, free them a little more aggressively, and try very hard to concentrate allocations on fuller chunks. Also, lots of new documentation. svn:r13484
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 9f430f4700..5cdf9eff5e 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -979,6 +979,17 @@ This option only affects name lookups that your server does on
behalf of clients, and only takes effect if Tor was built with
eventdns support.
(Default: 0)
+.LP
+.TP
+\fBBridgeRecordUsageByCountry \fR\fB0\fR|\fB1\fR\fP
+When this option is enabled and BridgeRelay is also enabled, and we
+have GeoIP data, Tor keeps a keep a per-country count of how many
+client addresses have contacted it so that it can help the bridge
+authority guess which countries have blocked access to it.
+.LP
+.TP
+\fBGeoIPFile \fR\fIfilename\fP
+A filename containing GeoIP data, for use with BridgeRecordUsageByCountry.
.SH DIRECTORY SERVER OPTIONS
.PP