commit f0fb55ad30ddcb620943490bf11f591d3b2ba694 Author: Roger Dingledine arma@torproject.org Date: Sun Oct 2 02:22:03 2016 -0400

simplify we_use_microdescriptors_for_circuits() --- src/or/microdesc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/or/microdesc.c b/src/or/microdesc.c index ccb28a9..140117f 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. */