[tor-commits] [tor/master] Provide missing documentation for two options. For 11634.

[nickm at torproject.org]

commit 03be8c775a86696fe0fbcc533b24ed4d9a0491ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 28 12:37:47 2014 -0400

    Provide missing documentation for two options. For 11634.
---
 doc/tor.1.txt |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 47bbc51..ac8ccfb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2014,6 +2014,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS
     When set to 1, IPv6 OR ports are being tested just like IPv4 OR
     ports. (Default: 0)
 
+[[MinMeasuredBWsForAuthToIgnoreAdvertised]] **MinMeasuredBWsForAuthToIgnoreAdvertised** __N__::
+    A total value, in abstract bandwidth units, describing how much
+    measured total bandwidth an authority should have observed on the network
+    before it will treat advertised bandwidths as wholly
+    unreliable. (Default: 500)
+
 HIDDEN SERVICE OPTIONS
 ----------------------
 
@@ -2216,6 +2222,10 @@ The following options are used for running a testing Tor network.
     events.  Changing this requires that **TestingTorNetwork** is set.
     (Default: 0)
 
+[[TestingMinExitFlagThreshold]] **TestingMinExitFlagThreshold**  __N__ **KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**::
+    Sets a lower-bound for assigning an exit flag when running as an
+    authority on a testing network. Overrides the usual default lower bound
+    of 4 KB. (Default: 0)
 
 SIGNALS
 -------