commit 2b871d0a08828bfd596519c552b73b697fd18882 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 22 10:00:17 2021 -0500

Update proposal 321 based on discussions from @arma

See tor#40134 --- proposals/321-happy-families.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/proposals/321-happy-families.md b/proposals/321-happy-families.md index f9ac7b4..4d8f144 100644 --- a/proposals/321-happy-families.md +++ b/proposals/321-happy-families.md @@ -62,8 +62,10 @@ We add a new entry to microdescriptors: `family-keys`.

This line contains one or more space-separated strings describing families to which the node belongs. These strings MUST be sorted in -lexicographic order. Clients MUST NOT depend on any particular property -of these strings. +lexicographic order. These strings MAY be base64-formated nonpadded +ed25519 family keys, or may represent some future encoding. + +Clients SHOULD accept unrecognized key formats.

## Changes to voting algorithm

@@ -125,7 +127,9 @@ family if ANY of these is true: in its family line, and B's descriptor lists A in its family line.

* Client A has descriptors for A and B, and they both contain the - same entry in their family-keys or family-cert. + same entry in their family-keys or family-cert. (Note that a + family-cert key may match a base64-encoded entry in the family-keys + entry.)

## Migration