tor

commit 9cbc40e37675e77a654bad88f99959873759b9fd
parent 5fc0437e748932291627ebd7fd949b987023362e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  1 Feb 2018 15:28:11 -0500

Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1

Diffstat:
A
changes/bug25070
 | 
3
+++
M
src/or/protover.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug25070 b/changes/bug25070
@@ -0,0 +1,3 @@
+  o Major bugfixes (protocol versions):
+    - Add Link protocol version 5 to the supported protocols list.
+      Fixes bug 25070; bugfix on 0.3.1.1-alpha.
diff --git a/src/or/protover.c b/src/or/protover.c
@@ -292,7 +292,7 @@ protover_get_supported_protocols(void)
     "HSDir=1-2 "
     "HSIntro=3-4 "
     "HSRend=1-2 "
-    "Link=1-4 "
+    "Link=1-5 "
     "LinkAuth=1,3 "
     "Microdesc=1-2 "
     "Relay=1-2";