diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 11:30:49 +0100 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 12:09:42 +0100 |
| commit | 2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4 (patch) | |
| tree | f4639f6ed8b224087e665373ba147df1fd53144d /doc | |
| parent | 49278cd68a0d84727ae1131e677bc3481b3e2fc7 (diff) | |
| parent | e46de82c97e694d3bfa399af48b9de9365e264bd (diff) | |
| download | tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar.gz | |
Merge branch 'morestats4' into morestats5
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.h
src/or/control.c
src/or/control.h
src/or/or.h
src/or/relay.c
src/or/relay.h
src/test/test.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ac33c5907..615da2d57 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2061,6 +2061,9 @@ The following options are used for running a testing Tor network. TestingDescriptorMaxDownloadTries 80 TestingMicrodescMaxDownloadTries 80 TestingCertMaxDownloadTries 80 + TestingEnableConnBwEvent 1 + TestingEnableCellStatsEvent 1 + TestingEnableTbEmptyEvent 1 [[TestingV3AuthInitialVotingInterval]] **TestingV3AuthInitialVotingInterval** __N__ **minutes**|**hours**:: Like V3AuthVotingInterval, but for initial voting interval before the first @@ -2155,6 +2158,22 @@ The following options are used for running a testing Tor network. In order for this option to have any effect, **TestingTorNetwork** has to be set. +[[TestingEnableConnBwEvent]] **TestingEnableConnBwEvent** **0**|**1**:: + If this option is set, then Tor controllers may register for CONN_BW + events. Changing this requires that **TestingTorNetwork** is set. + (Default: 0) + +[[TestingEnableCellStatsEvent]] **TestingEnableCellStatsEvent** **0**|**1**:: + If this option is set, then Tor controllers may register for CELL_STATS + 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) + + SIGNALS ------- |