[tor-commits] [stem/master] Note that bridge-extra-info 1.2 is ok

[atagar at torproject.org]

commit baab680f3bf1b000a494db25012d1bc303bea3f4
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Mar 25 08:25:17 2015 -0700

    Note that bridge-extra-info 1.2 is ok
    
    George was understandably confused since we say that we support 1.1 but the
    descriptors say 1.2. We only check the major version so either is fine.
    Collector docs for this say...
    
      'nothing has changed as compared to version 1.1'
    
    Sounds like we shouldn't have the version at all but meh, trivial to say it's
    ok.
---
 stem/descriptor/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index 85ff986..8c0df9d 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -121,7 +121,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume
   network-status-microdesc-consensus-3 1.0  :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`)
   bridge-network-status 1.0                 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`)
   bridge-server-descriptor 1.0              :class:`~stem.descriptor.server_descriptor.BridgeDescriptor`
-  bridge-extra-info 1.1                     :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`
+  bridge-extra-info 1.1 or 1.2              :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`
   torperf 1.0                               **unsupported**
   bridge-pool-assignment 1.0                **unsupported**
   tordnsel 1.0                              :class:`~stem.descriptor.tordnsel.TorDNSEL`