aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-13 10:47:24 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-13 10:47:24 -0400
commitb152d62cee7480ee7b9b68dd9b619db65b6cd112 (patch)
treeff89d131f60906f9d1b8e06af77883b3d1155769 /doc
parentad57b1279ab68e204243ddf3cf841fd85606c331 (diff)
parent787bafc0f916c143ac244a217accf755817512df (diff)
downloadtor-b152d62cee7480ee7b9b68dd9b619db65b6cd112.tar.gz
tor-b152d62cee7480ee7b9b68dd9b619db65b6cd112.zip
Merge branch 'token_bucket_refactor_squashed'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index c3493f7181..5c88e86fb3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2883,7 +2883,6 @@ The following options are used for running a testing Tor network.
TestingDirConnectionMaxStall 30 seconds
TestingEnableConnBwEvent 1
TestingEnableCellStatsEvent 1
- TestingEnableTbEmptyEvent 1
[[TestingV3AuthInitialVotingInterval]] **TestingV3AuthInitialVotingInterval** __N__ **minutes**|**hours**::
Like V3AuthVotingInterval, but for initial voting interval before the first
@@ -3021,11 +3020,6 @@ The following options are used for running a testing Tor network.
events. Changing this requires that **TestingTorNetwork** is set.
(Default: 0)
-[[TestingEnableTbEmptyEvent]] **TestingEnableTbEmptyEvent** **0**|**1**::
- If this option is set, then Tor controllers may register for TB_EMPTY
- events. Changing this requires that **TestingTorNetwork** is set.
- (Default: 0)
-
[[TestingMinExitFlagThreshold]] **TestingMinExitFlagThreshold** __N__ **KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
Sets a lower-bound for assigning an exit flag when running as an
authority on a testing network. Overrides the usual default lower bound