diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-14 19:15:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-14 19:15:10 -0500 |
| commit | dec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e (patch) | |
| tree | c0bec0910b04f69b9b68ed394b31fad5fbb895f7 | |
| parent | 7e469c10020f92b6aa19cb3f4316fb040d837819 (diff) | |
| parent | 3f005c0433c56a540c211c9b6be1cf45a8185bc7 (diff) | |
| download | tor-dec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e.tar.gz tor-dec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e.zip | |
Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
| -rw-r--r-- | changes/ticket20656 | 3 | ||||
| -rw-r--r-- | src/or/protover.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket20656 b/changes/ticket20656 new file mode 100644 index 0000000000..28192e8978 --- /dev/null +++ b/changes/ticket20656 @@ -0,0 +1,3 @@ + o Minor feature (protover): + - Add new protocol version for proposal 224. HSIntro now advertises + version "3-4" and HSDir version "1-2". Fixes ticket 20656. diff --git a/src/or/protover.c b/src/or/protover.c index ceaf2d5ccf..88d549ab35 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -289,8 +289,8 @@ protover_get_supported_protocols(void) "Cons=1-2 " "Desc=1-2 " "DirCache=1 " - "HSDir=1 " - "HSIntro=3 " + "HSDir=1-2 " + "HSIntro=3-4 " "HSRend=1-2 " "Link=1-4 " "LinkAuth=1,3 " |