Merge branch 'tor-gitlab/mr/126'

8 files changed, 9 insertions, 10 deletions

diff --git a/src/app/config/app_config.md b/src/app/config/app_config.md
index b359ce77f6..96a55494ff 100644
--- a/src/app/config/app_config.md
+++ b/src/app/config/app_config.md
@@ -2,5 +2,4 @@
 @brief app/config: Top-level configuration code
 
 Refactoring this module is a work in progress, see
-[ticket 29211](https://trac.torproject.org/projects/tor/ticket/29211).
-
+[ticket 29211](https://bugs.torproject.org/tpo/core/tor/29211)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 96f21eea33..5c8a3792ee 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3592,7 +3592,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
              "configured. This is bad because it's very easy to locate your "
              "entry guard which can then lead to the deanonymization of your "
              "hidden service -- for more details, see "
-             "https://trac.torproject.org/projects/tor/ticket/14917. "
+             "https://bugs.torproject.org/tpo/core/tor/14917. "
              "For this reason, the use of one EntryNodes with an hidden "
              "service is prohibited until a better solution is found.");
     return -1;
@@ -3609,7 +3609,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
              "be harmful to the service anonymity. Because of this, we "
              "recommend you either don't do that or make sure you know what "
              "you are doing. For more details, please look at "
-             "https://trac.torproject.org/projects/tor/ticket/21155.");
+             "https://bugs.torproject.org/tpo/core/tor/21155.");
   }
 
   /* Single Onion Services: non-anonymous hidden services */
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 76e9ccf0a5..ab4ce9f784 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -2148,7 +2148,7 @@ count_acceptable_nodes, (const smartlist_t *nodes, int direct))
  * The alternative is building the circuit in reverse. Reverse calls to
  * onion_extend_cpath() (ie: select outer hops first) would then have the
  * property that you don't gain information about inner hops by observing
- * outer ones. See https://trac.torproject.org/projects/tor/ticket/24487
+ * outer ones. See https://bugs.torproject.org/tpo/core/tor/24487
  * for this.
  *
  * (Note further that we still exclude the exit to prevent A - B - A
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index c0c28c9e2d..c31fe00dea 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -2144,7 +2144,7 @@ circuit_mark_all_dirty_circs_as_unusable(void)
  * This function is in the critical path of circuit_mark_for_close().
  * It must be (and is) O(1)!
  *
- * See https://trac.torproject.org/projects/tor/ticket/23512.
+ * See https://bugs.torproject.org/tpo/core/tor/23512
  */
 void
 circuit_synchronize_written_or_bandwidth(const circuit_t *c,
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
index d3f904d286..6504c680eb 100644
--- a/src/feature/relay/relay_config.c
+++ b/src/feature/relay/relay_config.c
@@ -1037,7 +1037,7 @@ options_validate_relay_mode(const or_options_t *old_options,
         "Tor is currently configured as a relay and a hidden service. "
         "That's not very secure: you should probably run your hidden service "
         "in a separate Tor process, at least -- see "
-        "https://trac.torproject.org/8742");
+        "https://bugs.torproject.org/tpo/core/tor/8742.");
 
   if (options->BridgeRelay && options->DirPort_set) {
     log_warn(LD_CONFIG, "Can't set a DirPort on a bridge relay; disabling "
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 675b977ade..9bf0e7026f 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -176,7 +176,7 @@ routerinfo_err_is_transient(int err)
   /**
    * For simplicity, we consider all errors other than
    * "not a server" transient - see discussion on
-   * https://trac.torproject.org/projects/tor/ticket/27034
+   * https://bugs.torproject.org/tpo/core/tor/27034.
    */
   return err != TOR_ROUTERINFO_ERROR_NOT_A_SERVER;
 }
diff --git a/src/lib/string/compat_string.h b/src/lib/string/compat_string.h
index f05265bdcc..5c9bf05ebd 100644
--- a/src/lib/string/compat_string.h
+++ b/src/lib/string/compat_string.h
@@ -42,7 +42,7 @@ static inline int strcasecmp(const char *a, const char *b) {
  * (If --enable-fragile-hardening is passed to configure, we use the hardened
  * variants, which do not suffer from this issue.)
  *
- * See https://trac.torproject.org/projects/tor/ticket/15205
+ * See https://bugs.torproject.org/tpo/core/tor/15205.
  */
 #undef strlcat
 #undef strlcpy
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 8e0d19f126..714ee4767f 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1013,7 +1013,7 @@ test_options_validate__relay_with_hidden_services(void *ignored)
             "Tor is currently configured as a relay and a hidden service. "
             "That's not very secure: you should probably run your hidden servi"
             "ce in a separate Tor process, at least -- see "
-            "https://trac.torproject.org/8742\n");
+            "https://bugs.torproject.org/tpo/core/tor/8742.\n");
 
  done:
   teardown_capture_of_logs();