aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-30 11:18:00 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-30 11:18:00 -0400
commitc6846d7bf0d8a382bea17304ea29a51c3a895f90 (patch)
tree9a19d14b30659e2e7b1cf47be683bc9da2abc677 /doc
parenta31f55b16ba26c5c3720640bf27157fd7ab45c40 (diff)
parent13a16e001164581b687dae2d3377f77eedb701ff (diff)
downloadtor-c6846d7bf0d8a382bea17304ea29a51c3a895f90.tar.gz
tor-c6846d7bf0d8a382bea17304ea29a51c3a895f90.zip
Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b49ebfd121..64f0da0eeb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -602,6 +602,13 @@ GENERAL OPTIONS
message currently has at least one domain; most currently have exactly
one. This doesn't affect controller log messages. (Default: 0)
+[[MaxUnparseableDescSizeToLog]] **MaxUnparseableDescSizeToLog** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**::
+ Unparseable descriptors (e.g. for votes, consensuses, routers) are logged
+ in separate files by hash, up to the specified size in total. Note that
+ only files logged during the lifetime of this Tor process count toward the
+ total; this is intended to be used to debug problems without opening live
+ servers to resource exhaustion attacks. (Default: 10 MB)
+
[[OutboundBindAddress]] **OutboundBindAddress** __IP__::
Make all outbound connections originate from the IP address specified. This
is only useful when you have multiple network interfaces, and you want all