commit 4d6a1243342fdc2da6ccec5658bae0438624f494 Author: Damian Johnson atagar@torproject.org Date: Sat Jun 21 11:32:15 2014 -0700

Changing bridge descriptor link to CollecTor

Sanatized bridge descriptors are described on both Metrics' formats page and CollecTor...

https://metrics.torproject.org/formats.html#bridgedesc https://collector.torproject.org/formats.html#bridge-descriptors

Switching to the later. I believe the descriptor types are the only thing we still link to on the old format page...

https://metrics.torproject.org/formats.html#descriptortypes

However, it doesn't have a direct counterpart in CollecTor. It enumerates all descriptor annotations, but CollecTor only includes the annotations it uses. --- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/server_descriptor.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 72bc672..7d562d6 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -902,7 +902,7 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`bridge descriptor specification - https://metrics.torproject.org/formats.html#bridgedesc`_) + https://collector.torproject.org/formats.html#bridge-descriptors`_) """

def __init__(self, raw_contents, validate = True): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 78e8741..5d5e779 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -858,7 +858,7 @@ class RelayDescriptor(ServerDescriptor): class BridgeDescriptor(ServerDescriptor): """ Bridge descriptor (`bridge descriptor specification - https://metrics.torproject.org/formats.html#bridgedesc`_) + https://collector.torproject.org/formats.html#bridge-descriptors`_) """

def __init__(self, raw_contents, validate = True, annotations = None): @@ -890,9 +890,8 @@ class BridgeDescriptor(ServerDescriptor): """ Checks if we've been properly scrubbed in accordance with the `bridge descriptor specification - https://metrics.torproject.org/formats.html#bridgedesc`_. Validation is a - moving target so this may not - be fully up to date. + https://collector.torproject.org/formats.html#bridge-descriptors`_. + Validation is a moving target so this may not be fully up to date.

:returns: **True** if we're scrubbed, **False** otherwise """