diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-29 15:17:05 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-29 15:17:05 -0500 |
| commit | 3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7 (patch) | |
| tree | 72ce97eb89ecf28cced0f2098f1d23b4bc2f4283 /src/or/nodelist.c | |
| parent | 4fe253ef40a96dbfb978752e9d2833e8b491ca28 (diff) | |
| download | tor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.tar tor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.tar.gz | |
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/nodelist.c')
| -rw-r--r-- | src/or/nodelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 86219b77c..d1a226e4f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -213,7 +213,7 @@ void nodelist_set_consensus(networkstatus_t *ns) { const or_options_t *options = get_options(); - int authdir = authdir_mode_v2(options) || authdir_mode_v3(options); + int authdir = authdir_mode_v3(options); int client = !server_mode(options); init_nodelist(); @@ -1333,7 +1333,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, smartlist_t *myexits= smartlist_new(); double f_guard, f_mid, f_exit, f_myexit; int np, nu; /* Ignored */ - const int authdir = authdir_mode_v2(options) || authdir_mode_v3(options); + const int authdir = authdir_mode_v3(options); count_usable_descriptors(num_present_out, num_usable_out, mid, consensus, options, now, NULL, 0); |