Commit beec881f authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.4'

parents 4d7ac69f c03cfc05

doc/tor.1.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -2023,12 +2023,12 @@ The following options are used for running a testing Tor network. 
    **TestingTorNetwork** is set. (Default: 30 minutes)

    **TestingTorNetwork** is set. (Default: 30 minutes)





**TestingV3AuthInitialVoteDelay** __N__ **minutes**|**hours**::

**TestingV3AuthInitialVoteDelay** __N__ **minutes**|**hours**::

    Like TestingV3AuthInitialVoteDelay, but for initial voting interval before

    Like V3AuthVoteDelay, but for initial voting interval before

    the first consensus has been created. Changing this requires that

    the first consensus has been created. Changing this requires that

    **TestingTorNetwork** is set. (Default: 5 minutes)

    **TestingTorNetwork** is set. (Default: 5 minutes)





**TestingV3AuthInitialDistDelay** __N__ **minutes**|**hours**::

**TestingV3AuthInitialDistDelay** __N__ **minutes**|**hours**::

    Like TestingV3AuthInitialDistDelay, but for initial voting interval before

    Like V3AuthDistDelay, but for initial voting interval before

    the first consensus has been created. Changing this requires that

    the first consensus has been created. Changing this requires that

    **TestingTorNetwork** is set. (Default: 5 minutes)

    **TestingTorNetwork** is set. (Default: 5 minutes)