Merge remote-tracking branch 'asn/bug5540'

This commit is contained in:
Nick Mathewson 2012-05-10 14:24:17 -04:00
commit 1cf970c3db

View File

@ -60,10 +60,10 @@ Recognized fields are:
One or more of these may be present.
The format is "transportname addr:port", to remember the address at
which a pluggable transport was listening.
[XXXX why?]
The format is "transportname addr:port", to remember the address
at which a pluggable transport was listening. Tor bridges use
this information to spawn pluggable transport listeners in the
same IP address and TCP port even after tor client restarts.
BWHistoryReadEnds (ISO time)
BWHistoryReadInterval (integer, number of seconds)