Merge remote branch 'sebastian/continuation'

This commit is contained in:
Nick Mathewson
2010-09-24 13:43:55 -04:00
4 changed files with 140 additions and 6 deletions
+4 -1
View File
@@ -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