[tor-commits] [torspec/master] Allow parsers to fail files with duplicate relay lines

[nickm at torproject.org]

commit b03483635d7e3c9371054643fc5140f650706ae0
Author: teor <teor at torproject.org>
Date:   Tue Jan 22 10:15:34 2019 +1000

    Allow parsers to fail files with duplicate relay lines
---
 bandwidth-file-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 714c456..a940904 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -319,9 +319,10 @@
   There MUST NOT be multiple KeyValue pairs with the same key in the same
   RelayLine. If there are, the parser SHOULD choose an arbitrary Value.
 
-  There MUST NOT be multiple RelayLine per relay identity (node_id or
+  There MUST NOT be multiple RelayLines per relay identity (node_id or
   master_key_ed25519). If there are, parsers SHOULD issue a warning.
-  Parers MAY choose an arbitrary value, or ignore both values.
+  Parers MAY reject the file, choose an arbitrary RelayLine, or ignore
+  both RelayLines.
 
   If a parser does not recognize any extra material in a RelayLine,
   the extra material MUST be ignored.