commit 92cc4f9c2d28cb49c43eeaa4243df200fa22d387 Merge: 9492dbb 65c048e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 12:33:59 2014 -0500

Merge remote-tracking branch 'linus/prop220-nits'

Conflicts: proposals/220-ecc-id-keys.txt

proposals/220-ecc-id-keys.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --cc proposals/220-ecc-id-keys.txt index 153e0c9,cb8cf83..fef8beb --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@@ -236,9 -197,9 +236,9 @@@ Status: Draf option, to be set to "always-on" in the future once enough clients support it.

-2.3.2. Extra-info documents +2.5.2. Extra-info documents

- Extrainfo documents now include "identity-ed25519" and + Extra-info documents now include "identity-ed25519" and "router-signature-ed25519" fields in the same positions in which they appear in router descriptors.