From 4bd90e20b92fbe2b93fc53e24254f00e663d057e Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 3 Sep 2012 02:09:39 -0400 Subject: [PATCH 1/2] fix whitespace and trivial typo --- src/or/config.c | 2 +- src/or/microdesc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d5e80cc832..b9170f4200 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -464,7 +464,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"), diff --git a/src/or/microdesc.c b/src/or/microdesc.c index c1ac1c3758..b4d22c1c62 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -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 From 2131cc125bde702b30ad7655967f13ef9e4c8973 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 3 Sep 2012 18:50:27 -0400 Subject: [PATCH 2/2] Don't log about reloading the microdescriptor cache at startup Addresses bug 6759. --- changes/bug6759 | 6 ++++++ src/or/microdesc.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changes/bug6759 diff --git a/changes/bug6759 b/changes/bug6759 new file mode 100644 index 0000000000..b0092d01a3 --- /dev/null +++ b/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. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1c62..3bda9cbfaf 100644 --- a/src/or/microdesc.c +++ b/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.", - total); + log_info(LD_DIR, "Reloaded microdescriptor cache. Found %d descriptors.", + total); microdesc_cache_rebuild(cache, 0 /* don't force */);