[or-cvs] [tor/master] Authorities now support conditional consensuses

[Nick Mathewson]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sat, 19 Dec 2009 21:56:49 +0100
Subject: Authorities now support conditional consensuses
Commit: 9a07f30b90800a0741e81f405cd88563ed09bdb9

Mark them this way in add_trusted_dir_server
---
 src/or/routerlist.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3773ee2..029bd9a 100644
--- 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();
-- 
1.5.6.5