summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-01-29 15:17:05 -0500
committerNick Mathewson <nickm@torproject.org>2014-01-29 15:17:05 -0500
commit3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7 (patch)
tree72ce97eb89ecf28cced0f2098f1d23b4bc2f4283 /src/or/main.c
parent4fe253ef40a96dbfb978752e9d2833e8b491ca28 (diff)
downloadtor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.tar.gz
tor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.zip
Rip out all of the v2 directory code.
The remaining vestige is that we continue to publish the V2dir flag, and that, for the controller, we continue to emit v2 directory formats when requested.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c
index dd4214ef0b..a970e35801 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1458,8 +1458,6 @@ run_scheduled_events(time_t now)
/* If any networkstatus documents are no longer recent, we need to
* update all the descriptors' running status. */
- /* purge obsolete entries */
- networkstatus_v2_list_clean(now);
/* Remove dead routers. */
routerlist_remove_old_routers();
}
@@ -1948,9 +1946,6 @@ do_main_loop(void)
log_warn(LD_DIR,
"Couldn't load all cached v3 certificates. Starting anyway.");
}
- if (router_reload_v2_networkstatus()) {
- return -1;
- }
if (router_reload_consensus_networkstatus()) {
return -1;
}