194dbea24d
Run "make autostyle" with new "annotate_ifdef_directives"
2019-09-26 15:52:45 -04:00
d6d3e829dd
Merge branch 'maint-0.4.1'
2019-09-18 08:07:56 -04:00
70bcff6010
Merge branch 'bug31772_041' into maint-0.4.1
2019-09-18 08:07:50 -04:00
5f00c03ed0
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:28:38 -04:00
9e674d0eb4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:28:37 -04:00
02840169d8
Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
2019-09-17 21:28:29 -04:00
25af8ada30
Correct the syntax description for the MAPADDRESS command.
...
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.
Fixes bug 31772.
2019-09-17 19:26:45 -04:00
a3342b382a
Bump version to 0.4.1.6
2019-09-17 19:11:56 -04:00
c6f7943269
Merge branch 'bug31570_041' into maint-0.4.1
2019-09-17 19:04:25 -04:00
50f981719f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:58:44 -04:00
ef35435584
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 18:58:43 -04:00
dc41e6a80c
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
2019-09-17 18:58:06 -04:00
cec42be570
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:56:52 -04:00
ab74c3560a
Merge branch 'ticket31552_041' into maint-0.4.1
2019-09-17 18:54:05 -04:00
75d3c08219
bump to 0.4.2.1-alpha-dev
2019-09-17 11:36:43 -04:00
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
a28a682a1f
bump version to 0.4.2.1-alpha
2019-09-16 16:24:24 -04:00
68a0106bf3
Run "make autostyle" and fix wide lines.
2019-09-16 13:27:42 -04:00
8ad419744f
On windows, allow failures in test_parseconf.sh
...
There seems to be some unreliability issue with this test on
appveyor.
Addresses ticket 31757; This isn't a final fix for this issue, but
it should make CI pass.
2019-09-16 11:01:03 -04:00
a1694b7363
Fix a shellcheck warning in test_parseconf.sh.
...
I wonder why this didn't show up before.
2019-09-16 09:22:43 -04:00
cd72850e08
Merge branch 'tor-github/pr/1316'
2019-09-16 15:22:18 +03:00
5ec751b38b
Merge branch 'tor-github/pr/1324'
2019-09-16 15:21:28 +03:00
a1192b6b4a
Merge branch 'tor-github/pr/1273'
2019-09-16 15:20:25 +03:00
bdd17da9fd
Merge branch 'tor-github/pr/1318'
2019-09-16 15:19:38 +03:00
11cf4d9c3a
test_parseconf.sh: On --dump-config failure, --verify-config
2019-09-14 19:00:41 -04:00
7e9ee3a58d
Add a test with many non-default options.
2019-09-14 19:00:41 -04:00
617679df42
Add a few error test cases
2019-09-14 19:00:41 -04:00
80e858e3e6
Add an integration test for %include.
2019-09-14 19:00:41 -04:00
28025698a1
test_parseconf: run each test from inside its directory.
...
We need this to test includes and relative paths.
2019-09-14 19:00:41 -04:00
850a00dc07
Add test for +Option, /Option, and Option
...
Here we use these directives to replace, extend, or clear values in
torrc.defaults and in torrc.
2019-09-14 19:00:41 -04:00
2f7be9620b
Move our first 3 example conf_examples to named directories
...
I'm not planning to use "example" as the name for all of them, but
these first three _are_ simple examples.
2019-09-14 19:00:41 -04:00
7c7e8402b5
Add a test script to try parsing and encoding Tor configurations
...
This script takes a set of example torrcs and command-lines from
src/test/conf_examples. If a success is expected, it runs "tor
--dump-config" and compares the result with the one we expect. If a
failure is expected, it runs "tor --verify-config" and greps for the
error we expect.
2019-09-14 19:00:41 -04:00
bfc5f09979
Detect overflow or underflow on double config values.
...
Any floating point value too positive or negative to distinguish
from +/-Inf, or too small to distinguish from +/-0, is an
over/underflow.
2019-09-13 18:26:16 -04:00
286b129b09
Merge branch 'tor-github/pr/1319'
2019-09-12 13:53:59 -04:00
c39c9ce26b
Merge branch 'tor-github/pr/1285'
2019-09-12 13:47:09 -04:00
028733e8b6
Merge branch 'tor-github/pr/1303'
2019-09-12 18:09:35 +03:00
3aaa4d416b
Merge branch 'tor-github/pr/1299'
2019-09-12 18:08:00 +03:00
c3b1a25d46
Workaround for GCC "note" about "variable tracking size limit"
...
GCC complains that we are using too many variables here, probably
because of the sheer number of locals used for our tinytest macros.
Eventually we should fix that (see 30968), but this commit just
makes the "note" go away by splitting the test function into two.
2019-09-12 18:07:47 +03:00
261ec900db
Remove variable declarations from macros in test_addr_parse()
...
Instead, put them in the function itself.
This is an attempt to fix the gcc warning about the "variable
tracking size limit exceeded".
2019-09-12 18:07:47 +03:00
34bab120df
Ticket 31687: fix for tor_isinf() as well
...
tor_isinf() was new in 0.4.0, and also needs to look at the
same rules as clamp_double_to_i64()
2019-09-12 09:53:13 -04:00
0327f9a075
Merge branch 'ticket31687_035' into ticket31687_040
2019-09-12 09:51:04 -04:00
87944cecfc
Merge remote-tracking branch 'tor-github/pr/1300'
2019-09-12 08:50:09 -04:00
ae6e60281c
Update include.am files to refer to new location of confparse.[ch]
...
Tests should now pass again.
2019-09-11 10:22:01 -04:00
a90d1918af
Update #includes to point to confparse.h in its new location.
...
This commit was automatically generated by running
scripts/maint/rectify_include_paths.py .
2019-09-11 10:17:20 -04:00
87ca9e4d2a
Move confparse.[ch] into src/lib/confmgt/
...
This commit only does code movement, and does not clean up after
itself. As such, it will break compilation. I'm separating it for
ease of review.
2019-09-11 10:16:10 -04:00
bf8c3164b6
Add new entries to lib/confmgt ".may_include" file
...
confparse.[ch] will need these; checkIncludes confirms that we have
not introduced a cycle.
2019-09-11 10:13:57 -04:00
41261c3b5c
Merge branch 'tor-github/pr/1296'
2019-09-11 09:42:31 -04:00
478141e617
Document inconsistent usage of config_var_is_listable()
...
See also ticket 31654.
2019-09-11 09:42:19 -04:00
e61bfd0bfd
Extract common list of flags to use for obsolete variables.
2019-09-11 09:42:19 -04:00
fe5033d3b0
Clarify documentation on config_var_is_listable()
...
Here we make it clear we're only looking at listable variable names,
not at whether the variables themselves are gettable.
Also, remove an extraneous h.
(This commit is not a fixup, because of rebase conflicts.)
2019-09-11 09:42:19 -04:00
Nick Mathewson
George Kadianakis
David Goulet