Merge branch 'maint-0.3.1' into maint-0.3.2

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.

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