summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-14 10:31:56 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-26 10:56:53 -0700
commit4cbfee14d40221a25545d2d2c3d6e6ce76f6afe9 (patch)
tree58f95d804ce0a54460ac6e9b7054c60f67ec575a /src/or/dirserv.c
parent0a3da5ce79768c15da3897097f0cc7ba727a7d35 (diff)
downloadtor-4cbfee14d40221a25545d2d2c3d6e6ce76f6afe9.tar.gz
tor-4cbfee14d40221a25545d2d2c3d6e6ce76f6afe9.zip
Update prop264 implementation to split HSMid->HS{Intro,Rend}
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 99b2e8acd4..d3bc615abc 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2922,17 +2922,17 @@ 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 HSMid=1 Link=4 "
- "LinkAuth=1 Microdesc=1-2 Relay=2");
+ 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");
v3_out->recommended_client_protocols =
- tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 "
- "LinkAuth=1 Microdesc=1-2 Relay=2");
+ 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");
v3_out->required_client_protocols =
- tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 "
- "LinkAuth=1 Microdesc=1-2 Relay=2");
+ 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");
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");
+ tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
+ "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
v3_out->package_lines = smartlist_new();
{