diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-24 12:32:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-24 12:32:10 -0400 |
| commit | 33e4e30d0a0aa8717ca67cb82581e536b402f30b (patch) | |
| tree | 855ac6201c0be290de7235fd7a6bcb6561f88f39 | |
| parent | e01ea64f0a072b321bb8b33e32cfa5644b4364d4 (diff) | |
| parent | 98e1a1d106f9abe07d184bd4b0568bd50f91bf93 (diff) | |
| download | tor-33e4e30d0a0aa8717ca67cb82581e536b402f30b.tar.gz tor-33e4e30d0a0aa8717ca67cb82581e536b402f30b.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/27286 | 4 | ||||
| -rw-r--r-- | src/or/dirserv.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/changes/27286 b/changes/27286 new file mode 100644 index 0000000000..5f5f7a4ae7 --- /dev/null +++ b/changes/27286 @@ -0,0 +1,4 @@ + o Minor features (directory authorities): + - Authorities no longer vote to make the subprotocol version "LinkAuth=1" + a requirement: it is unsupportable with NSS, and hasn't been needed + since Tor 0.3.0.1-alpha. Closes ticket 27286. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7e4fc0c66e..ced40899d0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3108,16 +3108,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " - "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); + "Link=4 Microdesc=1-2 Relay=2"); v3_out->recommended_client_protocols = tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " - "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); + "Link=4 Microdesc=1-2 Relay=2"); v3_out->required_client_protocols = tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " - "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); + "Link=4 Microdesc=1-2 Relay=2"); v3_out->required_relay_protocols = tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " - "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2"); + "Link=3-4 Microdesc=1 Relay=1-2"); /* We are not allowed to vote to require anything we don't have. */ tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL)); |