From: Sebastian Hahn <sebastian@torproject.org>
Date: Sat, 19 Dec 2009 20:56:49 +0000 (+0100)
Subject: Authorities now support conditional consensuses
X-Git-Tag: tor-0.2.2.7-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a07f30b90800a0741e81f405cd88563ed09bdb9;p=thirdparty%2Ftor.git

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 3773ee2228..029bd9a0c1 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();