diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-02 12:53:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-02 12:53:52 -0400 |
| commit | 9265190b16cae3b95f73bfb478e97b4fcfba0e17 (patch) | |
| tree | f926c9d90e1af35c34298149a132c782d24dac58 /doc | |
| parent | 73a4c0690edd49ea8fec2b8034bc2b0b681acdb0 (diff) | |
| parent | a9d055c5c516924b2e87e416b154bf220b0a914e (diff) | |
| download | tor-9265190b16cae3b95f73bfb478e97b4fcfba0e17.tar.gz tor-9265190b16cae3b95f73bfb478e97b4fcfba0e17.zip | |
Merge branch 'bug1384'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 222aaf103c..db623c8da9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -64,7 +64,8 @@ OPTIONS 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. + quoted values. Options on the command line take precedence over + options found in the configuration file. **BandwidthRate** __N__ **bytes**|**KB**|**MB**|**GB**:: A token bucket limits the average incoming bandwidth usage on this node to |