[tor-commits] [stem/master] Update CollecTor links

[atagar at torproject.org]

commit c4abd00933fd176e70d968bdec7639d0714c7614
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jul 6 08:22:56 2017 -0700

    Update CollecTor links
    
    CollecTor's home just changed. Updating our links so they still work.
---
 stem/descriptor/__init__.py             | 4 ++--
 stem/descriptor/extrainfo_descriptor.py | 5 ++---
 stem/descriptor/networkstatus.py        | 2 +-
 stem/descriptor/server_descriptor.py    | 7 +++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index e61d205..66dc573 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -122,7 +122,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume
   tries to determine the descriptor type based on the following...
 
   * The @type annotation on the first line. These are generally only found in
-    the `CollecTor archives <https://collector.torproject.org/formats.html#relay-descriptors>`_.
+    the `CollecTor archives <https://metrics.torproject.org/collector.html#relay-descriptors>`_.
 
   * The filename if it matches something from tor's data directory. For
     instance, tor's 'cached-descriptors' contains server descriptors.
@@ -166,7 +166,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume
     my_descriptor_file = open(descriptor_path, 'rb')
 
   :param str,file,tarfile descriptor_file: path or opened file with the descriptor contents
-  :param str descriptor_type: `descriptor type <https://collector.torproject.org/formats.html>`_, this is guessed if not provided
+  :param str descriptor_type: `descriptor type <https://metrics.torproject.org/collector.html#data-formats>`_, this is guessed if not provided
   :param bool validate: checks the validity of the descriptor's content if
     **True**, skips these checks otherwise
   :param stem.descriptor.__init__.DocumentHandler document_handler: method in
diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py
index bfea309..3d6770f 100644
--- a/stem/descriptor/extrainfo_descriptor.py
+++ b/stem/descriptor/extrainfo_descriptor.py
@@ -19,8 +19,7 @@ Extra-info descriptors are available from a few sources...
  * control port via 'GETINFO extra-info/digest/\*' queries
  * the 'cached-extrainfo' file in tor's data directory
 
-* Archived descriptors provided by CollecTor
-  (https://collector.torproject.org/).
+* Archived descriptors provided by `CollecTor <https://metrics.torproject.org/collector.html>`_.
 
 * Directory authorities and mirrors via their DirPort.
 
@@ -997,7 +996,7 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor):
 class BridgeExtraInfoDescriptor(ExtraInfoDescriptor):
   """
   Bridge extra-info descriptor (`bridge descriptor specification
-  <https://collector.torproject.org/formats.html#bridge-descriptors>`_)
+  <https://metrics.torproject.org/collector.html#bridge-descriptors>`_)
 
   :var str ed25519_certificate_hash: sha256 hash of the original identity-ed25519
   :var str router_digest_sha256: sha256 digest of this document
diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py
index 1c0acab..9e7b74b 100644
--- a/stem/descriptor/networkstatus.py
+++ b/stem/descriptor/networkstatus.py
@@ -9,7 +9,7 @@ Documents can be obtained from a few sources...
 * The 'cached-consensus' file in Tor's data directory.
 
 * Archived descriptors provided by `CollecTor
-  <https://collector.torproject.org/>`_.
+  <https://metrics.torproject.org/collector.html>`_.
 
 * Directory authorities and mirrors via their DirPort.
 
diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py
index 2e1c776..8489b33 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -10,8 +10,7 @@ etc). This information is provided from a few sources...
 
 * The 'cached-descriptors' file in Tor's data directory.
 
-* Archived descriptors provided by CollecTor
-  (https://collector.torproject.org/).
+* Archived descriptors provided by `CollecTor <https://metrics.torproject.org/collector.html>`_.
 
 * Directory authorities and mirrors via their DirPort.
 
@@ -949,7 +948,7 @@ class RelayDescriptor(ServerDescriptor):
 class BridgeDescriptor(ServerDescriptor):
   """
   Bridge descriptor (`bridge descriptor specification
-  <https://collector.torproject.org/formats.html#bridge-descriptors>`_)
+  <https://metrics.torproject.org/collector.html#bridge-descriptors>`_)
 
   :var str ed25519_certificate_hash: sha256 hash of the original identity-ed25519
   :var str router_digest_sha256: sha256 digest of this document
@@ -992,7 +991,7 @@ class BridgeDescriptor(ServerDescriptor):
     """
     Checks if we've been properly scrubbed in accordance with the `bridge
     descriptor specification
-    <https://collector.torproject.org/formats.html#bridge-descriptors>`_.
+    <https://metrics.torproject.org/collector.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