tor

commit 31542cc306ea6d7f4ca629fccd9bcd536573f6d8
parent 61cb2993ddb39d72bb312c6904414151d71e0577
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  1 Feb 2018 15:28:17 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

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";