From: Roger Dingledine <arma@torproject.org>
Date: Sun, 2 Oct 2016 06:22:03 +0000 (-0400)
Subject: simplify we_use_microdescriptors_for_circuits()
X-Git-Tag: tor-0.3.0.1-alpha~234^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0fb55ad30ddcb620943490bf11f591d3b2ba694;p=thirdparty%2Ftor.git

simplify we_use_microdescriptors_for_circuits()
---

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. */