From 8b10677e71d7d0f433543f4874e2c8340859e834 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Jun 2025 10:32:20 -0400
Subject: [PATCH] Remove XXXs about Making CGO disable-able

---
 src/core/crypto/onion_crypto.c | 1 -
 src/core/or/circuitbuild.c     | 1 -
 src/core/or/extendinfo.c       | 2 --
 src/core/or/protover.c         | 1 -
 4 files changed, 5 deletions(-)

diff --git a/src/core/crypto/onion_crypto.c b/src/core/crypto/onion_crypto.c
index 7e7181d282..ba6f3c0987 100644
--- a/src/core/crypto/onion_crypto.c
+++ b/src/core/crypto/onion_crypto.c
@@ -282,7 +282,6 @@ relay_process_subproto_ext(const trn_extension_t *ext,
 
     if (cur->protocol_id == PRT_RELAY &&
         cur->proto_cap_number == PROTOVER_RELAY_CRYPT_CGO) {
-      // XXXX CGO: Should we test if CGO is enabled at the relay?
       params_out->crypto_alg = RELAY_CRYPTO_ALG_CGO_RELAY;
       params_out->cell_fmt = RELAY_CELL_FORMAT_V1;
     } else {
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 26ff519f6d..ebabb806c7 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -886,7 +886,6 @@ circuit_pick_create_handshake(uint8_t *cell_type_out,
       congestion_control_enabled())
     *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR_V3;
   else if (ei->enable_cgo)
-    // XXXX CGO: provide an enable option?
     *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR_V3;
   else
     *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR;
diff --git a/src/core/or/extendinfo.c b/src/core/or/extendinfo.c
index 7ee0d26a12..2fd83697fa 100644
--- a/src/core/or/extendinfo.c
+++ b/src/core/or/extendinfo.c
@@ -63,8 +63,6 @@ extend_info_new(const char *nickname,
 
   if (pv) {
     info->supports_ntor_v3 = pv->supports_ntor_v3;
-
-    // XXXX cgo Decide whether to set this!
     info->enable_cgo = pv->supports_cgo;
   }
 
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index f609a5f632..205be5d4ef 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -399,7 +399,6 @@ protocol_list_supports_protocol_or_later(const char *list,
 #define PR_LINKAUTH_V  "3"
 #define PR_MICRODESC_V "1-3"
 #define PR_PADDING_V   "2"
-// XXXX CGO: Make 6 conditional?
 #define PR_RELAY_V     "2-6"
 
 /** Return the string containing the supported version for the given protocol
-- 
2.47.3