Commit 1cf970c3 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge remote-tracking branch 'asn/bug5540'

parents e30a4311 31ed10f6
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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)