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 | 9773cd0f94d20c810f37021e475c132d611ef063 (patch) | |
| tree | ee2c182e04d27ed93944c376bd89cfec5f8855c1 | |
| parent | 51377a917e246b28f437f54f8adc9a472b91b5f4 (diff) | |
| parent | 31542cc306ea6d7f4ca629fccd9bcd536573f6d8 (diff) | |
| download | tor-9773cd0f94d20c810f37021e475c132d611ef063.tar.gz tor-9773cd0f94d20c810f37021e475c132d611ef063.zip | |
Merge branch '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 1a5f4ac91f..41b50df87f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -332,7 +332,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"; |