Commit 883af78a authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Clarify that cmd-line options override torrc options

parent 39378bf1

doc/tor.1.txt

+2 −1
Original line number Diff line number Diff line
@@ -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