commit ba4791d1ca255b9e91d5b0a8e11471714f78d08a Author: juga0 juga@riseup.net Date: Fri Jun 26 07:07:35 2020 +0000

fix: Replace links from Trac to Gitlab --- docs/source/contributing.rst | 5 ++--- docs/source/man_sbws.ini.rst | 2 +- docs/source/man_sbws.rst | 2 +- docs/source/tor_bandwidth_files.rst | 4 ++-- sbws/core/scanner.py | 4 +++- sbws/lib/v3bwfile.py | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 15da287..66cf9d2 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -17,9 +17,8 @@ Bug reports or feature requests

.. _ticket-ref:

-* Open a ticket in - `Tor Project Trac https://trac.torproject.org`_ - and assign the component to ``Core Tor``/``sbws``. +* Open a issue in + `Tor Project Trac https://gitlab.torproject.org/tpo/network-health/sbws/-/issues`_ .

Code/documentation patches --------------------------- diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 5f4241b..22512b8 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -226,4 +226,4 @@ SEE ALSO BUGS ----

-Please report bugs at https://trac.torproject.org/. \ No newline at end of file +Please report bugs at https://gitlab.torproject.org/tpo/network-health/sbws/-/issues/. diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst index c9411e4..608c36d 100644 --- a/docs/source/man_sbws.rst +++ b/docs/source/man_sbws.rst @@ -114,4 +114,4 @@ https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt, BUGS ----

-Please report bugs at https://trac.torproject.org/. \ No newline at end of file +Please report bugs at https://gitlab.torproject.org/tpo/network-health/sbws/-/issues/. diff --git a/docs/source/tor_bandwidth_files.rst b/docs/source/tor_bandwidth_files.rst index 94aaae7..94fae97 100644 --- a/docs/source/tor_bandwidth_files.rst +++ b/docs/source/tor_bandwidth_files.rst @@ -18,7 +18,7 @@ To appear in Tor v0.4.1.x:

bandwidth-file-digest sha256=01234567890123456789abcdefghijkl

-https://trac.torproject.org/projects/tor/ticket/26698 +https://gitlab.torproject.org/tpo/core/tor/-/issues/26698

Directory authorities' bandwidth file URL ----------------------------------------- @@ -29,4 +29,4 @@ To appear in Tor v0.4.1.x:

/tor/status-vote/next/bandwidth.z

-https://trac.torproject.org/projects/tor/ticket/21377 +https://gitlab.torproject.org/tpo/core/tor/-/issues/21377 diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 3210c80..e5d5e90 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -43,7 +43,9 @@ rd = None controller = None

FILLUP_TICKET_MSG = """Something went wrong. -Please create a ticket in https://trac.torproject.org with this traceback.""" +Please create an issue at +https://gitlab.torproject.org/tpo/network-health/sbws/-/issues with this +traceback."""

def stop_threads(signal, frame, exit_code=0): diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 0c1f9b6..343a490 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1250,7 +1250,7 @@ class V3BWFile(object): # Generators SHOULD NOT limit measured bandwidths based on # descriptors' bandwidth-observed, because that penalises new # relays. - # See https://trac.torproject.org/projects/tor/ticket/8494 + # See https://gitlab.torproject.org/tpo/core/tor/-/issues/8494 # If the observed bandwidth is None, it is not possible to # calculate the minimum with the other descriptors. # Only in this case, take the consensus bandwidth.