diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:18:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:18:51 -0400 |
| commit | 05ded76cb6791d5f9472e39c9e3ebb64f450d219 (patch) | |
| tree | 1cd1a33c83140d779c063cd92ea8bd64a49c6b1d | |
| parent | 3da9a14f1c8b02215db1a14e31b6d5de4074998b (diff) | |
| parent | 2131cc125bde702b30ad7655967f13ef9e4c8973 (diff) | |
| download | tor-05ded76cb6791d5f9472e39c9e3ebb64f450d219.tar.gz tor-05ded76cb6791d5f9472e39c9e3ebb64f450d219.zip | |
Merge remote-tracking branch 'arma/bug6759'
| -rw-r--r-- | changes/bug6759 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/microdesc.c | 6 |
3 files changed, 10 insertions, 4 deletions
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/config.c b/src/or/config.c index a7d6a21a74..a5a8fec507 100644 --- a/src/or/config.c +++ b/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"), diff --git a/src/or/microdesc.c b/src/or/microdesc.c index c1ac1c3758..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 */); @@ -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 |