Merge remote-tracking branch 'arma/bug6759'

changes/bug6759

@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Don't log about reloading the microdescriptor cache at startup. Our
+      bootstrap warnings are supposed to tell the user when there's a
+      problem, and our bootstrap notices say when there isn't. Fixes
+      bug 6759; bugfix on 0.2.2.6-alpha.
+

src/or/config.c

@@ -466,7 +466,7 @@ static config_var_t _option_vars[] = {
 /** Override default values with these if the user sets the TestingTorNetwork
  * option. */
 static const config_var_t testing_tor_network_defaults[] = {
-  V(ServerDNSAllowBrokenConfig,  BOOL,  "1"),
+  V(ServerDNSAllowBrokenConfig,  BOOL,     "1"),
   V(DirAllowPrivateAddresses,    BOOL,     "1"),
   V(EnforceDistinctSubnets,      BOOL,     "0"),
   V(AssumeReachable,             BOOL,     "1"),

src/or/microdesc.c

@@ -323,8 +323,8 @@ microdesc_cache_reload(microdesc_cache_t *cache)
     }
     tor_free(journal_content);
   }
-  log_notice(LD_DIR, "Reloaded microdescriptor cache.  Found %d descriptors.",
+  log_info(LD_DIR, "Reloaded microdescriptor cache. Found %d descriptors.",
-             total);
+           total);
 
   microdesc_cache_rebuild(cache, 0 /* don't force */);
 
@@ -653,7 +653,7 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache,
   return result;
 }
 
-/** Launch download requests for mircodescriptors as appropriate.
+/** Launch download requests for microdescriptors as appropriate.
  *
  * Specifically, we should launch download requests if we are configured to
  * download mirodescriptors, and there are some microdescriptors listed the