diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-01 15:28:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-01 15:28:17 -0500 |
| commit | 31542cc306ea6d7f4ca629fccd9bcd536573f6d8 (patch) | |
| tree | 9422dab645f55e50a378bb16f75c521270216614 | |
| parent | 61cb2993ddb39d72bb312c6904414151d71e0577 (diff) | |
| parent | 9cbc40e37675e77a654bad88f99959873759b9fd (diff) | |
| download | tor-31542cc306ea6d7f4ca629fccd9bcd536573f6d8.tar.gz tor-31542cc306ea6d7f4ca629fccd9bcd536573f6d8.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/bug25070 | 3 | ||||
| -rw-r--r-- | src/or/protover.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug25070 b/changes/bug25070 new file mode 100644 index 0000000000..c2f4e58c45 --- /dev/null +++ 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 index 0946092692..033e9063ac 100644 --- 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"; |