[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/82'

[nickm at torproject.org]

commit 1b05c7c9ed286190cdd40a99a2638ddb7c2b75e2
Merge: ddcc8f9 57c85e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 14 11:40:56 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/82'

 bandwidth-file-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc bandwidth-file-spec.txt
index 2776fab,6bb10a3..abcd0a8
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@@ -112,8 -112,8 +112,9 @@@
  
      Line ::= ArgumentChar* NL
      RelayLine ::= KeyValue (SP KeyValue)* NL
 +    HeaderLine ::= KeyValue NL
-     KeyValue ::= Keyword "=" Value
+     KeyValue ::= Key "=" Value
+     Key ::= (KeywordChar | "_")+
      Value ::= ArgumentCharValue+
      ArgumentCharValue ::= any printing ASCII character except NL and SP.
      Terminator ::= "=====" or "===="