torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,972 Commits 53 Branches 631 Tags
2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2
Commit Graph

9155 Commits

Author SHA1 Message Date
teor 2b2e53b7fb Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-04 13:23:52 +10:00
teor 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
teor aa94f81add Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-01 23:03:47 +10:00
David Goulet 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
David Goulet 7d6e9d7d95 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-30 13:38:57 -04:00
George Kadianakis 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
David Goulet 78ac7c751c Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-26 09:15:00 -04:00
David Goulet e472737297 Merge branch 'tor-github/pr/1794' into maint-0.4.3 2020-03-26 09:14:25 -04:00
Nick Mathewson 0c7725be84 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-25 10:56:27 -04:00
Nick Mathewson 03b0d1840a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-25 10:56:27 -04:00
Nick Mathewson 048714d2ce Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-25 10:56:27 -04:00
George Kadianakis 8f9c04ae73 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-23 16:57:27 +02:00
George Kadianakis 29420ab396 Merge branch 'tor-github/pr/1788' into maint-0.4.3 2020-03-23 16:56:59 +02:00
Nick Mathewson 0db545b17a Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-20 08:06:53 -04:00
Nick Mathewson e380396d42 Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3 2020-03-20 08:06:30 -04:00
Nick Mathewson 3913575acd Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-20 07:57:19 -04:00
teor 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
Nick Mathewson 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
teor 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
teor 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
teor 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
teor 4225301444 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-20 11:25:01 +10:00
teor eb2d08a72c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-20 11:24:57 +10:00
teor 3aa855dc68 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-20 11:24:51 +10:00
Nick Mathewson 42ea03eb7f Merge branch 'ticket33643_skip_035' into ticket33643_skip_041 2020-03-19 18:38:18 -04:00
Nick Mathewson ee3d23c05a Appveyor: disable crypto/openssl_version 2020-03-19 18:36:36 -04:00
Nick Mathewson 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
teor 6c2b153db0 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-19 17:01:58 +10:00
teor 259fad5877 Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3 2020-03-19 16:56:49 +10:00
Nick Mathewson 2d47cb984d fold in changelog and blurb for trove-2020-002 2020-03-17 15:37:34 -04:00
Nick Mathewson e0d68ce84f Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-17 15:22:36 -04:00
Nick Mathewson 85141a3a74 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-17 15:22:36 -04:00
Nick Mathewson 3bd0601aec Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-17 15:22:36 -04:00
Nick Mathewson 3c8a4b8fbd Merge branch 'trove_2020_002_041' into maint-0.4.1 2020-03-17 15:22:02 -04:00
Nick Mathewson fe3d8ec38e Merge branch 'trove_2020_002_035' into maint-0.3.5 2020-03-17 15:21:48 -04:00
Nick Mathewson 4d1d8bde95 Fold new items into 0.4.3.3-alpha changelog. 2020-03-17 14:22:36 -04:00
Nick Mathewson 6803373aab Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-17 13:56:10 -04:00
Nick Mathewson 4ee2699416 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-17 13:56:10 -04:00
Nick Mathewson 7e010cac39 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-17 13:56:10 -04:00
Nick Mathewson cec647ff3e Merge branch 'trove_2020_004_041_v2' into maint-0.4.1 2020-03-17 13:56:03 -04:00
Nick Mathewson e15a621ac8 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-17 11:45:16 -04:00
Nick Mathewson 5f4e14b8c8 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-17 11:45:16 -04:00
Nick Mathewson 86bbd6eca3 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-17 11:45:16 -04:00
Nick Mathewson bbc80ea042 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-17 11:45:16 -04:00
George Kadianakis 089e57d22f Fix TROVE-2020-003. 
Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).

In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.
 2020-03-17 11:44:45 -04:00
David Goulet ee3e987898 sendme: Emit version 1 by default 
Closes #33623

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-17 10:14:57 -04:00
Nick Mathewson 78bcfc1280 circpad_setup_machine_on_circ(): exit early on error. 
This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens.  Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.

Fixes bug 33619; bugfix on 0.4.0.1-alpha.  This is also tracked as
TROVE-2020-004.
 2020-03-16 17:59:57 -04:00
Nick Mathewson e150e1af75 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-16 12:21:57 -04:00
Nick Mathewson 855cd533e1 Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3 2020-03-16 12:21:49 -04:00
Nick Mathewson 452398913a Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test 2020-03-16 10:40:55 -04:00