diff options
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c42aae0e09..620f938741 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -65,7 +65,10 @@ Other options can be specified either on the command-line (--option value), or in the configuration file (option value or option "value"). Options are case-insensitive. C-style escaped characters are allowed inside quoted values. Options on the command line take precedence over - options found in the configuration file. + options found in the configuration file, except indicated otherwise. To + split one configuration entry into multiple lines, use a single \ before + the end of the line. Comments can be used in such multiline entries, but + they must start at the beginning of a line. **BandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**:: A token bucket limits the average incoming bandwidth usage on this node to @@ -1228,7 +1231,7 @@ The following options are used to configure a hidden service. **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also - uploaded whenever it changes. (Default: 20 minutes) + uploaded whenever it changes. (Default: 1 hour) TESTING NETWORK OPTIONS ----------------------- |