nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

simplify we_use_microdescriptors_for_circuits()

Browse Source
This commit is contained in:
Roger Dingledine 2016-10-02 02:22:03 -04:00
parent 782b6ec288
commit f0fb55ad30
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/microdesc.c
View File

@ -917,12 +917,9 @@ update_microdescs_from_networkstatus(time_t now)
int
we_use_microdescriptors_for_circuits(const or_options_t *options)
{
int ret = options->UseMicrodescriptors;
if (ret == -1) {
/* UseMicrodescriptors is "auto"; choose yes. */
return 1;
}
return ret;
if (options->UseMicrodescriptors == 0)
return 0; /* the user explicitly picked no */
return 1; /* yes and auto both mean yes */
}
/** Return true iff we should try to download microdescriptors at all. */