[tor-commits] [torspec/master] Add a note on master-key-ed25519 to prop220

[nickm at torproject.org]

commit 0ebd5db019e32229f2f4afed4b4871501cac0084
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 1 11:54:30 2015 -0400

    Add a note on master-key-ed25519 to prop220
---
 proposals/220-ecc-id-keys.txt |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt
index cf11740..793ef90 100644
--- a/proposals/220-ecc-id-keys.txt
+++ b/proposals/220-ecc-id-keys.txt
@@ -224,6 +224,11 @@ Status: Draft
    key also signs all three keys as part of signing the descriptor.
 
 
+   When an ed25519 signature is present, there MAY be a "master-key-ed25519"
+   element containing the base64 encoded ed25519 master key as a single
+   argument.  If it is present, it MUST match the identity key in
+   the certificate.
+
 2.5.1. Checking descriptor signatures.
 
    Current versions of Tor will handle these new formats by ignoring the