diff options
| author | Andrea Shepard <andrea@torproject.org> | 2013-01-24 08:10:12 -0800 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-01-24 08:10:12 -0800 |
| commit | dfbd19df418347d833df650e68367c96a3aa37ad (patch) | |
| tree | 32962e1f966839748b7ecb83f87deb69b5cc8399 /doc | |
| parent | b415aba5fa3b52aabd250007a6f6304ee7825cbb (diff) | |
| parent | 677d18278e5b27a43f3f56906d97a9575d26c6f4 (diff) | |
| download | tor-dfbd19df418347d833df650e68367c96a3aa37ad.tar tor-dfbd19df418347d833df650e68367c96a3aa37ad.tar.gz | |
Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 40cf66dbc..d107fa915 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1376,9 +1376,9 @@ is non-zero): If set, and we are an exit node, allow clients to use us for IPv6 traffic. (Default: 0) -**MaxOnionsPending** __NUM__:: - If you have more than this number of onionskins queued for decrypt, reject - new ones. (Default: 100) +**MaxOnionQueueDelay** __NUM__ [**msec**|**second**]:: + If we have more onionskins queued for processing than we can process in + this amount of time, reject new ones. (Default: 1750 msec) **MyFamily** __node__,__node__,__...__:: Declare that this Tor server is controlled or administered by a group or |