diff --git a/changes/happy-families b/changes/happy-families index 5a56cb1b299e1dabf645a333e3edcb259ca6e51e..c4520129c98c11d8f55f1cffc54106016d2e01a9 100644 --- a/changes/happy-families +++ b/changes/happy-families @@ -13,4 +13,5 @@ thereby simplifying family operation, and making microdescriptor downloads approximately 80% smaller. - For more information, see (XXXX INSERT URL HERE). + For more information, see + https://community.torproject.org/relay/setup/post-install/family-ids/ diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 39e270ee4b16af3d0e381ef52142b70961387336..efe78f2004acd3b412bd7f4d97f14c397484fe8b 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -173,7 +173,8 @@ The following options in this section are only recognized on the To use this key, install it on every relay in your family. (Put it in the relay's `KeyDirectory`.) Then enable the corresponding FamilyID option on your relays. - See (XXXX INSERT URL HERE) for more information. + See https://community.torproject.org/relay/setup/post-install/family-ids/ + for more information. **`--passphrase-fd`** __FILEDES__:: File descriptor to read the passphrase from. Note that unlike with the @@ -2488,7 +2489,7 @@ is non-zero): this also generates the value you should use in the __ident__ field in a file ending with ".public\_family\_id". For information on generating and installing a family - key, see (XXXX INSERT URL HERE). + key, see https://community.torproject.org/relay/setup/post-install/family-ids/ + In the future, this will be the preferred way for relays to advertise family membership. @@ -4067,7 +4068,8 @@ __KeyDirectory__/**`secret_onion_key_ntor`** and **`secret_onion_key_ntor.old`** __KeyDirectory__/__keyname__**`.secret_family_key`**:: A relay family's family identity key. Used to prove membership in a relay family. - See (XXXX INSERT URL HERE) for more information. + See https://community.torproject.org/relay/setup/post-install/family-ids/ + for more information. __DataDirectory__/**`fingerprint`**:: Only used by servers. Contains the fingerprint of the server's RSA diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index 755c19c603c53adc43f8bb942ef1bd6f47bc1997..39c56fcf1fb5410b23c9ab8f4df2eb12211fc089 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -878,6 +878,9 @@ load_family_id_keys(const or_options_t *options, return 0; } +#define FAMILY_INFO_URL \ + "https://community.torproject.org/relay/setup/post-install/family-ids/" + /** Generate warnings as appropriate about our family ID configuration. * * `options` is required; `ns` may be NULL. @@ -907,7 +910,7 @@ warn_about_family_id_config(const or_options_t *options, "MyFamily was configured, but FamilyId was not. " "It's a good time to start migrating your relays " "to use family keys. " - "See (XXXX INSERT URL HERE) for instructions."); + "See "FAMILY_INFO_URL " for instructions."); have_warned_absent_familykeys = 1; } }