commit e77ae419b1fddf22b27bff6474aa586418096669 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Thu Aug 15 03:45:36 2013 +0000

We use the "a" line of a bridge from the NS for its OR Address

The "a" line in the network status is checked and signed by the bridge authority, so we prefer this over the "or-address" line in the bridge descriptor. --- bridge-db-spec.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bridge-db-spec.txt b/bridge-db-spec.txt index e3735c9..0e07dcc 100644 --- a/bridge-db-spec.txt +++ b/bridge-db-spec.txt @@ -40,10 +40,13 @@

"r" SP nickname SP identity SP digest SP publication SP IP SP ORPort SP DirPort NL + "a" SP address ":" port NL (no more than 8 instances) "s" SP Flags NL

- BridgeDB parses the identity from the "r" line and the assigned flags - from the "s" line. + BridgeDB parses the identity and the publication timestamp from the "r" + line, the OR address(es) and ORPort(s) from the "a" line(s), and the + assigned flags from the "s" line, specifically checking the assignment + of the "Running" and "Stable" flags. BridgeDB memorizes all bridges that have the Running flag as the set of running bridges that can be given out to bridge users. BridgeDB memorizes assigned flags if it wants to ensure that sets of