diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-24 12:35:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-24 12:35:26 -0400 |
| commit | b1d0fa04fb8ac321d6c46633635cdf84ba416168 (patch) | |
| tree | 8d1a642b9655bb89cab7a393a8e03e044594d692 /src/feature | |
| parent | 08a1619e7f2ba0abe20fcf1b07e3b7f3a050da37 (diff) | |
| parent | 658171318f67dd83ee115044cbf103325951a174 (diff) | |
| download | tor-b1d0fa04fb8ac321d6c46633635cdf84ba416168.tar.gz tor-b1d0fa04fb8ac321d6c46633635cdf84ba416168.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 6477f34baf..a97f3c47d8 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4566,16 +4566,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)); |