commit 4f57d5871e2b8cc54639d05208233947d4d43f56 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 26 13:19:26 2016 -0400
Update authority votes to match updated proposal. --- src/or/dirserv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 03b05ac..99b2e8a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2920,19 +2920,19 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, v3_out->client_versions = client_versions; v3_out->server_versions = server_versions;
- /* These are hardwired to avoid disaster. */ + /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1-2 Cons=1-2 Microdesc=1-2 " - "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->recommended_client_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=4 LinkAuth=1 Relay=2"); - v3_out->required_relay_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->required_client_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=1 LinkAuth=1 Relay=2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); + v3_out->required_relay_protocols = + tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=3-4 " + "LinkAuth=1 Microdesc=1 Relay=1-2");
v3_out->package_lines = smartlist_new(); {