Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-01 15:28:17 -05:00 · 2018-02-01 15:28:17 -05:00 · 1a4876587e
parent df37b93336 31542cc306
commit 1a4876587e
2 changed files with 4 additions and 1 deletions
--- 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.
--- 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";