Authorities now support conditional consensuses

Mark them this way in add_trusted_dir_server

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3773ee222823b7291f4e04adf09173bd698fdf32..029bd9a0c1169581826a3f41181b5359c762be45 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3680,12 +3680,8 @@ add_trusted_dir_server(const char *nickname, const char *address,
 
   if (ent->or_port)
     ent->fake_status.version_supports_begindir = 1;
-/* XX021 - wait until authorities are upgraded */
-#if 0
+
   ent->fake_status.version_supports_conditional_consensus = 1;
-#else
-  ent->fake_status.version_supports_conditional_consensus = 0;
-#endif
 
   smartlist_add(trusted_dir_servers, ent);
   router_dir_info_changed();