summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-22Remove unused arguments from options_validate().Nick Mathewson
This change breaks compilation; a subsequent commit will fix it with a coccinelle patch.
2019-10-22validate_fn(): remove now-unused defaults and from_setconf.Nick Mathewson
These arguments were only used by options_validate, and are now ignored even there.
2019-10-22Remove changes files that are already merged in 0.4.2.Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1446'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1417'Nick Mathewson
2019-10-22Simplify CHECK_DEFAULT() logic a little further.Nick Mathewson
Since each of these tests only applies to testing networks, put them all into a single block that checks for testing networks. (I recommend reviewing with the "diff -b" option, since the change is mostly indentation.)
2019-10-22Make options_validate() no longer use its "defaults" argument.Nick Mathewson
It can just look at what the defaults are. Closes ticket 32185.
2019-10-22Merge branch 'bug32175'Nick Mathewson
2019-10-22Merge branch 'from_setconf_removal_squashed'Nick Mathewson
2019-10-22changes file for 31999Nick Mathewson
2019-10-22Extract log-granularity code into its own function.Nick Mathewson
This pleases practracker.
2019-10-22Add tests for options_init_logs()Nick Mathewson
2019-10-22Make a pair of add_*_log() functions mockable.Nick Mathewson
2019-10-22Make options_init_logs STATIC for testing.Nick Mathewson
2019-10-22Update tests to handle new interpretation of quiet_level.Nick Mathewson
Two things needed to be changed. First, we used to set quiet_level to the default (QUIET_NONE) when running tests, since we would not call anything that acted based upon it. But since we sometimes call options_init_logs(), we need to pre-set quiet_level to QUIET_SILENT in the logs so that we don't add the default logs. This did not cause test failure: just unwanted logs. Second, we had a test that checked whether options_validate was messing with options->Logs correctly. Since options_validate no longer messes with the logs, we no longer want a test for this.
2019-10-22Rationalize handling of quiet_level in config.cNick Mathewson
Formerly, we would use quiet_level as an excuse to rewrite the log configuration, adding a default log line if none existed, and if RunAsDaemon was not set, and if we were not being invoked via setconf (!). This is against our best practices for several reasons: * We should not be changing configured options except when the user tells us to do so. * We should especially not be changing options in the options_validate function. * Distinguishing whether we are being called from setconf adds a risky special-case. Instead, this patch take a simpler approach: it changes the interpretation of having no logging lines set to mean: If there is a stdout, add a default log based on quiet_level. Solves ticket 31999.
2019-10-22Merge branch 'maint-0.4.2'teor
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-22Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5teor
2019-10-22Merge branch 'ticket32177_041' into ticket32177_042teor
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build from ticket32177_041.
2019-10-22Merge branch 'ticket32177_040' into ticket32177_041teor
2019-10-22Merge branch 'ticket32177_035' into ticket32177_040teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion