Merge remote-tracking branch 'dgoulet/ticket20656_030_01'

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.

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 "