Nick Mathewson
91413e04b4
Remove changes files that are already merged in 0.4.2.
2019-10-22 13:01:25 -04:00
Nick Mathewson
de24a7f992
Merge branch 'maint-0.4.2'
2019-10-22 12:54:44 -04:00
Nick Mathewson
edc3f70635
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:54:43 -04:00
Nick Mathewson
3c071f3002
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
2019-10-22 12:54:37 -04:00
Nick Mathewson
7c88fcf4e2
Merge branch 'maint-0.4.2'
2019-10-22 12:53:12 -04:00
Nick Mathewson
5ddc04f49d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:53:12 -04:00
Nick Mathewson
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
Nick Mathewson
7d75e1dbdf
Merge remote-tracking branch 'tor-github/pr/1446'
2019-10-22 12:52:32 -04:00
Nick Mathewson
730f0e3da3
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:51:33 -04:00
Nick Mathewson
3989dd1616
Merge branch 'maint-0.4.2'
2019-10-22 12:51:33 -04:00
Nick Mathewson
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
Nick Mathewson
9537966a0b
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:15:14 -04:00
Nick Mathewson
4d43e1bf4f
Merge branch 'maint-0.4.2'
2019-10-22 12:15:14 -04:00
Nick Mathewson
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
Nick Mathewson
f58439ee55
Merge branch 'maint-0.4.2'
2019-10-22 12:13:56 -04:00
Nick Mathewson
c55c75bc97
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:13:55 -04:00
Nick Mathewson
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
Nick Mathewson
3939bb82f0
Merge branch 'maint-0.4.2'
2019-10-22 12:11:59 -04:00
Nick Mathewson
34f3d8d407
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:11:59 -04:00
Nick Mathewson
d4dde249a0
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
2019-10-22 12:11:50 -04:00
Nick Mathewson
da59dee5d4
Merge branch 'maint-0.4.2'
2019-10-22 12:10:30 -04:00
Nick Mathewson
e5b9eefb02
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:10:30 -04:00
Nick Mathewson
6965798a16
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 12:10:30 -04:00
Nick Mathewson
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
Nick Mathewson
21c3488af7
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
2019-10-22 12:10:08 -04:00
Nick Mathewson
8d7015eb8b
Merge branch 'maint-0.4.2'
2019-10-22 12:08:53 -04:00
Nick Mathewson
cbc67241db
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:08:53 -04:00
Nick Mathewson
4c8af10f0e
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
2019-10-22 12:08:46 -04:00
Nick Mathewson
2d013bbe5c
Merge remote-tracking branch 'tor-github/pr/1417'
2019-10-22 08:36:32 -04:00
Nick Mathewson
4413b030f2
Simplify CHECK_DEFAULT() logic a little further.
...
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-22 08:32:33 -04:00
Nick Mathewson
8d84e10e87
Make options_validate() no longer use its "defaults" argument.
...
It can just look at what the defaults are.
Closes ticket 32185.
2019-10-22 08:30:00 -04:00
Nick Mathewson
a1d5341374
Merge branch 'bug32175'
2019-10-22 07:51:30 -04:00
Nick Mathewson
65e80ce646
Merge branch 'from_setconf_removal_squashed'
2019-10-22 07:50:42 -04:00
Nick Mathewson
0bb2e77283
changes file for 31999
2019-10-22 07:50:13 -04:00
Nick Mathewson
6d15fab2dc
Extract log-granularity code into its own function.
...
This pleases practracker.
2019-10-22 07:50:13 -04:00
Nick Mathewson
9ac2c71cbd
Add tests for options_init_logs()
2019-10-22 07:50:13 -04:00
Nick Mathewson
f4fc633937
Make a pair of add_*_log() functions mockable.
2019-10-22 07:50:13 -04:00
Nick Mathewson
ac3136a6fb
Make options_init_logs STATIC for testing.
2019-10-22 07:50:13 -04:00
Nick Mathewson
98c3b3bb4c
Update tests to handle new interpretation of quiet_level.
...
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-22 07:50:13 -04:00
Nick Mathewson
e07b19d305
Rationalize handling of quiet_level in config.c
...
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-22 07:50:13 -04:00
teor
b3478a8856
Merge branch 'maint-0.4.2'
2019-10-22 20:48:26 +10:00
teor
f98b59524c
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 20:48:20 +10:00
teor
2318bb237f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 20:48:13 +10:00
teor
9bb0ca122f
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 20:48:05 +10:00
teor
bed4390133
Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5
2019-10-22 20:47:44 +10:00
teor
8f84999f58
Merge branch 'ticket32177_041' into ticket32177_042
...
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
2019-10-22 19:44:58 +10:00
teor
86b1714731
Merge branch 'ticket32177_040' into ticket32177_041
2019-10-22 19:43:38 +10:00
teor
868bcc24e5
Merge branch 'ticket32177_035' into ticket32177_040
2019-10-22 19:43:33 +10:00
teor
8e0190d837
Merge branch 'maint-0.3.5' into ticket32177_035
2019-10-22 19:43:18 +10:00
teor
4c4a0d50ff
Travis: Disable the Rust macOS build
...
This build was added in 0.3.5.
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:42:45 +10:00
