summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-04-24 15:51:53 +0000
committerPeter Palfrader <peter@palfrader.org>2008-04-24 15:51:53 +0000
commitc3c7e7114ef14f958ead66489c12b5909b05d775 (patch)
treeabea4d95bd7ce8667f4aa6668929ee61905f92e1 /src/or
parentca430446002a5d940222979c45af22b86c70d356 (diff)
downloadtor-c3c7e7114ef14f958ead66489c12b5909b05d775.tar.gz
tor-c3c7e7114ef14f958ead66489c12b5909b05d775.zip
Actually, do not use conditional consensus downloads until the authorities have upgraded
svn:r14453
Diffstat (limited to 'src/or')
-rw-r--r--src/or/routerlist.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index e909e6165f..5966d753ac 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3512,7 +3512,12 @@ 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();