Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
05a82b6d
Commit
05a82b6d
authored
3 weeks ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Fill in URL for FamilyId support.
parent
b8ebe8b2
No related branches found
No related tags found
1 merge request
!857
Implement proposal 321 (happy families)
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changes/happy-families
+2
-1
2 additions, 1 deletion
changes/happy-families
doc/man/tor.1.txt
+5
-3
5 additions, 3 deletions
doc/man/tor.1.txt
src/feature/relay/routerkeys.c
+4
-1
4 additions, 1 deletion
src/feature/relay/routerkeys.c
with
11 additions
and
5 deletions
changes/happy-families
+
2
−
1
View file @
05a82b6d
...
...
@@ -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/
This diff is collapsed.
Click to expand it.
doc/man/tor.1.txt
+
5
−
3
View file @
05a82b6d
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/feature/relay/routerkeys.c
+
4
−
1
View file @
05a82b6d
...
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment