diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-10-02 02:22:03 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-10-02 02:22:03 -0400 |
| commit | f0fb55ad30ddcb620943490bf11f591d3b2ba694 (patch) | |
| tree | fe7199b7966c25102368850ff5d56959fd7ed18f | |
| parent | 782b6ec288a553f66e47157d377ec4b200b54394 (diff) | |
| download | tor-f0fb55ad30ddcb620943490bf11f591d3b2ba694.tar.gz tor-f0fb55ad30ddcb620943490bf11f591d3b2ba694.zip | |
simplify we_use_microdescriptors_for_circuits()
| -rw-r--r-- | src/or/microdesc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index ccb28a914d..140117f683 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -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. */ |