a84fd949ed
Merge branch 'maint-0.4.3'
2020-04-04 13:23:56 +10:00
b1e1c6b505
changes: file for ticket 33782
...
Avoid conflicts between the fake sockets in tor's unit tests, and real
file descriptors. Resolves issues running unit tests with GitHub
Actions, where the process that embeds or launches the tests has
already opened a large number of file descriptors.
Fixes bug 33782; bugfix on 0.2.8.1-alpha.
Found and fixed by Putta Khunchalee.
2020-04-04 13:20:06 +10:00
a8a92b9456
Merge branch 'maint-0.4.3'
2020-04-01 23:03:51 +10:00
6c5c503a4c
configure: Fix enabled module variable expansion
...
Fixes #33646
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-04-01 23:02:24 +10:00
ca8e6451f2
Merge branch 'maint-0.4.3'
2020-03-30 13:38:58 -04:00
42e56f5bac
hs-v3: Relax severity of a log message when decoding descriptors.
...
Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to
ease debugging in the future.
2020-03-30 13:38:29 -04:00
ec8d41e699
changes: Add file for ticket 33014
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-03-30 13:36:54 -04:00
9061303080
Put *.a wildcard entry into .gitignore instead of listing all .a files
2020-03-28 14:01:07 +02:00
cf58b0b369
Merge branch 'maint-0.4.3'
2020-03-26 09:15:01 -04:00
e472737297
Merge branch 'tor-github/pr/1794' into maint-0.4.3
2020-03-26 09:14:25 -04:00
b2cda32693
Merge branch 'maint-0.4.3'
2020-03-25 10:56:27 -04:00
03b0d1840a
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-25 10:56:27 -04:00
048714d2ce
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-25 10:56:27 -04:00
a4d60ff854
Merge branch 'maint-0.4.3'
2020-03-23 16:57:27 +02:00
29420ab396
Merge branch 'tor-github/pr/1788' into maint-0.4.3
2020-03-23 16:56:59 +02:00
a0efba9bd0
Merge remote-tracking branch 'tor-github/pr/1797/head'
2020-03-23 09:05:45 -04:00
4b914dea02
Merge branch 'bug32588_043' into bug32588_master
2020-03-21 04:02:08 +10:00
52f61ec83e
Merge branch 'bug32588_042' into bug32588_043
...
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
2020-03-21 04:01:00 +10:00
5e2f31f177
Merge branch 'bug32588_041' into bug32588_042
2020-03-21 03:52:32 +10:00
2962c32b7a
Merge branch 'bug32588_035' into bug32588_041
...
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
2020-03-21 03:50:36 +10:00
861337fd6d
router: Stop advertising incorrect auto IPv6 ORPorts
...
When IPv6 ORPorts are set to "auto", tor relays and bridges would
advertise an incorrect port in their descriptor.
This may be a low-severity memory safety issue, because the published
port number may be derived from uninitialised or out-of-bounds memory
reads.
Fixes bug 32588; bugfix on 0.2.3.9-alpha.
2020-03-21 03:36:39 +10:00
e380396d42
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
2020-03-20 08:06:30 -04:00
3e24bd5557
Merge branch 'maint-0.4.3'
2020-03-20 07:56:42 -04:00
d4a74021e5
relay/dirauth: Set some output arguments in stubs
...
And document how some functions set their output arguments.
Fixes bug 33674; bugfix on 0.4.3.1-alpha.
2020-03-20 07:56:26 -04:00
c478dc9b2f
Set *have_low_ports_out from stub port_parse_ports_relay().
...
Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.
Fixes bug 33668; bugfix on 0.4.3.1-alpha.
2020-03-20 07:56:26 -04:00
bb3df5f322
practracker: Disable practracker in git hooks
...
Disable our coding standards best practices tracker in our git hooks.
0.4.3 branches only.
Closes ticket 33678.
2020-03-20 17:32:57 +10:00
26fd31fef8
Merge branch 'bug33673_035' into bug33673_041
...
Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.
2020-03-20 14:49:11 +10:00
38e07b88fa
Appveyor: Copy required DLLs to test and app
...
Copy required DLLs to test and app, before running tor's tests.
This ensures that tor.exe and test*.exe use the correct version of each
DLL. This fix is not required, but we hope it will avoid DLL search
issues in future.
Closes bug 33673; bugfix on 0.3.4.2-alpha.
2020-03-20 14:48:31 +10:00
4bb06cae26
Merge branch 'maint-0.4.3'
2020-03-20 11:25:04 +10:00
eb2d08a72c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-20 11:24:57 +10:00
3aa855dc68
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-20 11:24:51 +10:00
42ea03eb7f
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
2020-03-19 18:38:18 -04:00
ee3d23c05a
Appveyor: disable crypto/openssl_version
2020-03-19 18:36:36 -04:00
6bafe97bc1
Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.
...
For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run
the tests and suppress all the "crypto/" tests. You could get the
same effect by running "./src/test/test :crypto/..", but that can be
harder to arrange from CI.
Part of a fix/workaround for 33643.
2020-03-19 18:36:36 -04:00
9ffbe8ad59
Remove changes files that have appeared in 0.4.3.3-alpha
...
(findMergedChanges.pl is the tool to do this.)
2020-03-19 08:07:21 -04:00
e8f0860557
Merge branch 'tor-github/pr/1792'
2020-03-19 13:43:49 +02:00
8bba933760
changes: Add changes file for ticket 33458
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-03-19 13:43:39 +02:00
fe5ecaa270
Merge branch 'maint-0.4.3'
2020-03-19 17:02:02 +10:00
259fad5877
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
2020-03-19 16:56:49 +10:00
3d8c97a988
Merge branch 'maint-0.4.3'
2020-03-17 15:22:36 -04:00
e0d68ce84f
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 15:22:36 -04:00
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
3c8a4b8fbd
Merge branch 'trove_2020_002_041' into maint-0.4.1
2020-03-17 15:22:02 -04:00
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
d4595b344a
Merge branch 'maint-0.4.3'
2020-03-17 13:56:10 -04:00
6803373aab
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 13:56:10 -04:00
4ee2699416
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 13:56:10 -04:00
cec647ff3e
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1
2020-03-17 13:56:03 -04:00
270fe01557
Merge branch 'maint-0.4.3'
2020-03-17 11:47:35 -04:00
e15a621ac8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 11:45:16 -04:00
teor
David Goulet
George Kadianakis
rl1987
Nick Mathewson