[tor-commits] [tor/master] protover: Add new version for prop224 for HSIntro/HSDir

[nickm at torproject.org]

commit 3f005c0433c56a540c211c9b6be1cf45a8185bc7
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Feb 14 10:49:28 2017 -0500

    protover: Add new version for prop224 for HSIntro/HSDir
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/ticket20656 | 3 +++
 src/or/protover.c   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket20656 b/changes/ticket20656
new file mode 100644
index 0000000..28192e8
--- /dev/null
+++ b/changes/ticket20656
@@ -0,0 +1,3 @@
+  o Minor feature (protover):
+    - Add new protocol version for proposal 224. HSIntro now advertises
+      version "3-4" and HSDir version "1-2". Fixes ticket 20656.
diff --git a/src/or/protover.c b/src/or/protover.c
index ceaf2d5..88d549a 100644
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -289,8 +289,8 @@ protover_get_supported_protocols(void)
     "Cons=1-2 "
     "Desc=1-2 "
     "DirCache=1 "
-    "HSDir=1 "
-    "HSIntro=3 "
+    "HSDir=1-2 "
+    "HSIntro=3-4 "
     "HSRend=1-2 "
     "Link=1-4 "
     "LinkAuth=1,3 "